openmw-tes3coop/components/sdlutil
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
..
events.hpp Readded input & event handling 2015-05-13 16:50:47 +02:00
imagetosurface.cpp Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
imagetosurface.hpp Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
OISCompat.hpp Readded input & event handling 2015-05-13 16:50:47 +02:00
sdlcursormanager.cpp Minor addition to reading display 2015-05-18 21:05:17 +02:00
sdlcursormanager.hpp Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
sdlgraphicswindow.cpp Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
sdlgraphicswindow.hpp Silence an annoying message 2015-05-14 00:40:51 +02:00
sdlinputwrapper.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
sdlinputwrapper.hpp Readded input & event handling 2015-05-13 16:50:47 +02:00
sdlvideowrapper.cpp Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00
sdlvideowrapper.hpp Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00