dteviot 36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings ... Conflicts: apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwmechanics/actors.cpp extern/sdl4ogre/sdlcursormanager.cpp		2015-03-08 18:29:12 +13:00
..
inputmanagerimp.cpp	Merge remote-tracking branch 'OpenMW/master' into FixWarnings	2015-03-08 18:29:12 +13:00
inputmanagerimp.hpp	fixed warning C4099:	2015-03-06 21:36:42 +13:00