]> git.sesse.net Git - vlc/commit
svn merge -r 11179:11181 trunk branches/0.8.2
authorRémi Denis-Courmont <rem@videolan.org>
Fri, 27 May 2005 20:42:13 +0000 (20:42 +0000)
committerRémi Denis-Courmont <rem@videolan.org>
Fri, 27 May 2005 20:42:13 +0000 (20:42 +0000)
commit367279c4d875f8290868118315dceeb938828cef
treebe8ec750029ddc8c8e30c3e25d8124e681c58d69
parent9f4baa097050d3d8cde4663750b155b815f9ed3a
svn merge -r 11179:11181 trunk branches/0.8.2
modules/demux/playlist/b4s.c
modules/demux/playlist/m3u.c
modules/demux/playlist/pls.c
src/input/demux.c
src/playlist/view.c