scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwgui/mainmenu.cpp apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/debugging.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/sky.cpp components/nif/nifkey.hpp components/nif/nifstream.hpp components/nifbullet/bulletnifloader.cpp components/nifogre/ogrenifloader.hpp libs/openengine/bullet/physic.cpp libs/openengine/gui/manager.cpp		2015-05-04 02:41:50 +02:00
..
inputmanagerimp.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-05-04 02:41:50 +02:00
inputmanagerimp.hpp	Stub InputManager	2015-05-03 17:24:35 +02:00