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
..
.gitignore
CMakeLists.txt
esmtool.cpp	Merge branch 'refnum' into savedgame	2014-01-12 16:58:06 +01:00
labels.cpp	Closes #1086: Implement blood effects	2014-01-17 11:27:13 +01:00
labels.hpp	Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.	2014-01-14 07:42:03 +01:00
record.cpp	Fix some typos and accidental commit	2014-01-15 14:53:28 +01:00
record.hpp	Various fixes for CppCheck warnings.	2013-12-06 07:36:16 +01:00