David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # README.md # apps/openmw/mwgui/quickkeysmenu.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/combat.cpp		2018-07-04 01:52:29 +03:00
..
inputmanagerimp.cpp	Merge pull request #456 from OpenMW/master while resolving conflicts	2018-07-04 01:52:29 +03:00
inputmanagerimp.hpp	more unused stuff cleanup	2017-11-11 14:14:24 +01:00