OpenMW

mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00

History

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

Moved esmtool to apps/

2010-07-21 13:52:28 +02:00

CMakeLists.txt

We don't need Carbon on OS X anymore

2013-06-15 14:47:33 +04:00

esmtool.cpp

Merge branch 'refnum' into savedgame

2014-01-12 16:58:06 +01:00

labels.cpp

Closes #1086 : Implement blood effects