]> git.sesse.net Git - vlc/commit
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)
commitc5c06b64c806052086e5772d64e540a8db7e4a9b
tree53e4b76313ee57958823effb517470c8bc786f5d
parentca07b0f9329ebd62b7b04b5d63915900ecffff57
parent622c64a18a8d770b75df5ff6cd1a2f2013b6caa3
Merge branch '1.0-bugfix'

Conflicts:

src/input/input.c
src/input/input.c