David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp		2017-10-16 07:37:29 +03:00
..
inputmanagerimp.cpp	Merge pull request #313 from OpenMW/master while resolving conflicts	2017-10-16 07:37:29 +03:00
inputmanagerimp.hpp	Additionally use movement keys (default WASD) to navigate GUI buttons	2017-09-27 12:56:10 +00:00