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
..
doc	Merge branch 'master' into HEAD	2014-01-06 00:23:17 +01:00
filter	Various fixes for CppCheck warnings.	2013-12-06 07:36:16 +01:00
settings	XDG compliant paths	2013-12-26 20:53:51 +01:00
tools	Being any idiot is hard.	2014-01-15 12:52:38 +01:00
world	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame	2014-01-24 18:28:35 +01:00