mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 06:39:49 +00:00
Code Issues Projects Releases Wiki Activity
495aeb5d3b
OpenMW/extern/sdl4ogre
History
scrawl 495aeb5d3b Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
2013-06-12 12:34:33 +02:00
..
CMakeLists.txt
cursormanager.hpp fix includes for Windows 2013-01-12 17:52:26 -04:00
events.h fix includes for Windows 2013-01-12 17:52:26 -04:00
OISCompat.h fix includes for Windows 2013-01-12 17:52:26 -04:00
sdlcursormanager.cpp
sdlcursormanager.hpp fix includes for Windows 2013-01-12 17:52:26 -04:00
sdlinputwrapper.cpp Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00
sdlinputwrapper.hpp Merge branch 'master' into HEAD 2013-06-12 12:34:33 +02:00