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

..

mwbase

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

mwclass

Feature #960: Add knockdown and hit recovery for creatures

2014-01-17 17:41:16 +01:00

mwdialogue

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

mwgui

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

mwinput

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

mwmechanics

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

mwrender

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

mwscript

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

mwsound

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

mwstate

Implement savegame screenshots

2014-01-24 17:49:16 +01:00

mwworld

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

CMakeLists.txt

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

config.hpp.cmake

another minor correction (fixing the previous one)

2011-07-08 16:16:06 +02:00

crashcatcher.cpp

crashcatcher uname error checking

2014-01-09 00:52:37 +01:00

doc.hpp

first set of additional doxygen comments

2010-09-25 15:03:53 +02:00

engine.cpp

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00

engine.hpp

Merge branch 'master' into HEAD

2014-01-06 00:23:17 +01:00

main.cpp

Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame

2014-01-24 18:28:35 +01:00