[vlc-devel] commit: Merge branch 1.0-bugfix ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed May 20 18:54:01 CEST 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 20 19:46:41 2009 +0300| [7f12470415d98e9e0ac725f2bb96b5fa74ef27f1] | committer: Rémi Denis-Courmont 

Merge branch 1.0-bugfix

Conflicts:
	modules/video_filter/extract.c
	modules/video_filter/marq.c
	projects/mozilla/control/npolibvlc.cpp
	src/control/video.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7f12470415d98e9e0ac725f2bb96b5fa74ef27f1
---






More information about the vlc-devel mailing list