David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/main.cpp		2017-06-18 18:16:10 +03:00
..
inputmanagerimp.cpp	Merge pull request #228 from OpenMW/master while resolving conflicts	2017-06-18 18:16:10 +03:00
inputmanagerimp.hpp	Save controls state (Fixes #3598)	2016-10-20 02:12:01 +02:00