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
..
audiodecoder.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-05-23 20:33:44 +02:00
audiodecoder.hpp
audiofactory.hpp
CMakeLists.txt
libavwrapper.cpp
License.txt
videodefs.hpp
videoplayer.cpp	Give a name to video streams for logging purposes	2015-05-07 23:08:52 +02:00
videoplayer.hpp	Give a name to video streams for logging purposes	2015-05-07 23:08:52 +02:00
videostate.cpp	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-05-23 20:33:44 +02:00
videostate.hpp	Give a name to video streams for logging purposes	2015-05-07 23:08:52 +02:00