]> git.sesse.net Git - vlc/commit
Merge branch 1.0-bugfix
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 13 May 2009 18:57:34 +0000 (21:57 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 13 May 2009 18:57:34 +0000 (21:57 +0300)
commitc6d2ba8aa42a6b2fdb3e10db38c3ef053f65b19d
tree429c18a6543c9054ec5d425f0d38e4c328635dab
parent9c1f8ba149532713c7912eb233409b283c150155
parent2d4241a1f7ac7a1ce47e2646c93421a64c49d7ab
Merge branch 1.0-bugfix

Conflicts:
include/vlc/deprecated.h
src/control/video.c
src/libvlc.sym
include/vlc/deprecated.h
src/control/video.c
src/libvlc.sym