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
..
dialoguemanager.hpp	Several warning fixes	2015-01-23 15:34:47 +01:00
environment.cpp	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
environment.hpp	Include cleanup	2015-02-05 04:18:42 +01:00
inputmanager.hpp	Merge branch 'master' of https://github.com/OpenMW/openmw into joystick	2015-02-27 22:37:22 +01:00
journal.hpp	Several warning fixes	2015-01-23 15:34:47 +01:00
mechanicsmanager.hpp	Stolen item tracking overhaul part 2 (Fixes #2338)	2015-02-06 01:27:16 +01:00
scriptmanager.hpp	added missing const to ScriptManager::getLocals	2014-07-25 08:12:53 +02:00
soundmanager.hpp	Readded sound listener	2015-05-12 19:02:56 +02:00
statemanager.hpp	Add commandline option to load a save game on startup	2015-01-07 03:27:24 +01:00
windowmanager.hpp	Remove advanced FPS counter (obsoleted by the OSG stats viewer)	2015-05-02 17:48:24 +02:00
world.hpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-05-23 20:33:44 +02:00