Merge branch '1.0-bugfix'
authorRémi Duraffort <ivoire@videolan.org>
Tue, 26 May 2009 10:58:18 +0000 (12:58 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Tue, 26 May 2009 11:15:26 +0000 (13:15 +0200)
commit14f37b2101842fa6e427f962f689db74eff6faba
treee48492549c9307bc7704c6f0dc42a060ec9db167
parentc65eebb30a749abfb2140aaafde12f1764d258e1
parent46a33c34dcc8536ab6c875731ce7338e7b59826a
Merge branch '1.0-bugfix'
modules/control/gestures.c
modules/control/hotkeys.c