David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts ... # Conflicts: # apps/openmw/mwbase/dialoguemanager.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.hpp # apps/openmw/mwgui/container.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwscript/dialogueextensions.cpp		2017-10-06 04:10:04 +03:00
..
inputmanagerimp.cpp	Merge pull request #303 from OpenMW/master while resolving conflicts	2017-10-06 04:10:04 +03:00
inputmanagerimp.hpp	Additionally use movement keys (default WASD) to navigate GUI buttons	2017-09-27 12:56:10 +00:00