David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts ... # Conflicts: # .gitignore # apps/openmw/mwmechanics/actors.hpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp		2017-08-31 15:14:13 +03:00
..
inputmanagerimp.cpp	Merge pull request #280 from OpenMW/master while resolving conflicts	2017-08-31 15:14:13 +03:00
inputmanagerimp.hpp	Save controls state (Fixes #3598)	2016-10-20 02:12:01 +02:00