David Cernat 47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # apps/openmw/mwinput/inputmanagerimp.cpp		2016-10-24 09:18:21 +03:00
..
inputmanagerimp.cpp	Merge pull request #79 from OpenMW/master while resolving conflicts	2016-10-24 09:18:21 +03:00
inputmanagerimp.hpp	Save controls state (Fixes #3598)	2016-10-20 02:12:01 +02:00