Merge branch 'patch-sdl'
authorJean Privat <jean@pryen.org>
Wed, 12 Feb 2014 13:50:44 +0000 (08:50 -0500)
committerJean Privat <jean@pryen.org>
Wed, 12 Feb 2014 13:50:44 +0000 (08:50 -0500)
commit21b2dece30353e9b09e1a928591500618ba51ea4
treeeefb8a18d8ade03474d939d6a71bd0498e452588
parentb80e39e4c6ce6004edd7d8bbfc2e80d56c71e5cb
parent0d2e5c33c2470ecf285f8d3c24a9e9b1b689c0a6
Merge branch 'patch-sdl'