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

..

openengine

Merge remote-tracking branch 'OpenMW/master' into FixWarnings

2015-03-08 18:29:12 +13:00

platform

remove our stdint.h version that uses boost and force usage of system stdint.h

2014-03-05 17:08:58 +01:00