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
..
2015-02-10 20:25:57 +01:00
2015-05-12 03:02:15 +02:00
2013-08-06 20:38:41 -04:00
2015-02-09 17:45:48 +01:00
2011-11-21 14:08:44 +01:00
2014-12-24 15:45:12 +01:00
2013-08-06 20:38:41 -04:00
2014-05-22 20:50:00 +02:00
2014-12-13 02:51:18 +01:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2015-03-11 23:07:39 +01:00
2013-08-06 20:38:41 -04:00
2015-03-03 23:46:53 +01:00
2013-08-06 20:38:41 -04:00
2015-02-09 17:45:48 +01:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00
2015-03-03 13:04:57 +01:00
2015-03-06 21:36:42 +13:00
2015-02-09 17:45:48 +01:00
2013-08-06 20:38:41 -04:00
2015-05-19 21:39:17 +03:00
2015-03-06 21:36:42 +13:00
2015-03-08 13:07:29 +13:00
2015-03-06 21:36:42 +13:00
2015-05-23 20:33:44 +02:00
2013-08-06 20:38:41 -04:00
2015-02-09 17:45:48 +01:00
2015-02-09 17:45:48 +01:00
2014-10-17 10:59:25 +02:00
2015-03-06 21:36:42 +13:00
2015-03-03 23:46:53 +01:00
2013-08-06 20:38:41 -04:00
2014-12-08 23:58:20 +01:00
2013-08-06 20:38:41 -04:00
2015-05-11 16:38:16 +02:00
2013-08-06 20:38:41 -04:00
2015-05-23 20:33:44 +02:00
2015-03-11 10:54:45 -04:00
2013-08-06 20:38:41 -04:00
2013-08-06 20:38:41 -04:00