]> git.sesse.net Git - vlc/commitdiff
Merge branch 1.0-bugfix
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 16 May 2009 17:07:46 +0000 (20:07 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 16 May 2009 17:07:50 +0000 (20:07 +0300)
1  2 
modules/gui/qt4/input_manager.cpp

Simple merge