Merge branches 'sdl2' and 'master'
Merge branch 'master' of https://github.com/christopho/solarus
Explicit use of TextInput SDL events
Update OSX icon
add VideoManager::is_scale2x(mode) method
Forgot semicolon
Merge branch 'master' of https://github.com/christopho/solarus