]> git.sesse.net Git - vlc/commitdiff
Merge branch '1.0-bugfix'
authorRémi Duraffort <ivoire@videolan.org>
Tue, 26 May 2009 13:50:52 +0000 (15:50 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Tue, 26 May 2009 13:50:52 +0000 (15:50 +0200)
Conflicts:

src/input/input.c

1  2 
src/input/input.c

Simple merge