scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame ... Conflicts: apps/openmw/mwgui/referenceinterface.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwscript/cellextensions.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.cpp apps/openmw/mwworld/worldimp.cpp		2014-01-24 18:28:35 +01:00
..
model	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame	2014-01-24 18:28:35 +01:00
view	Include some required Ogre headers explicitely	2014-01-24 15:02:34 +01:00
CMakeLists.txt	Merge remote-tracking branch 'sirherrbatka/referencables_verifer'	2014-01-15 14:29:54 +01:00
editor.cpp	XDG compliant paths	2013-12-26 20:53:51 +01:00
editor.hpp	Fix for file path issues	2013-10-26 22:55:44 -05:00
main.cpp	Change destruction order - fixes a shutdown crash discovered with mesa	2013-12-26 20:53:52 +01:00