Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame ...

Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg

2013-12-07 12:27:06 +01:00

..

inputmanagerimp.cpp

Merge branch 'master' into savedgame

2013-12-07 12:27:06 +01:00

inputmanagerimp.hpp

Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.

2013-11-29 20:06:54 +01:00