Marc Zinnschlag 9025210965 Merge branch 'refnum' into savedgame ...

Conflicts:
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/manualref.hpp
	components/esm/cellref.hpp

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

..

mwbase

Merge branch 'master' into HEAD

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

mwclass

Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.

2014-01-05 20:53:45 +01:00

mwdialogue

Merge branch 'master' into HEAD

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

mwgui

Merge branch 'master' into HEAD

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

mwinput

Merge branch 'master' into HEAD

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

mwmechanics

Merge branch 'master' into HEAD

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

mwrender

Merge branch 'master' into HEAD

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

mwscript

Merge branch 'master' into HEAD

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

mwsound

Merge branch 'master' into HEAD

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

mwstate

Merge remote-tracking branch 'mrcheko/savedgame' into savedgame

2013-12-20 13:13:06 +01:00

mwworld

Merge branch 'refnum' into savedgame

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

CMakeLists.txt

Merge branch 'master' into HEAD

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

config.hpp.cmake

another minor correction (fixing the previous one)

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

crashcatcher.cpp

Change is_debugger_attached to a different hack

2013-11-16 18:15:54 +01:00

doc.hpp

first set of additional doxygen comments

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

engine.cpp

Merge branch 'master' into HEAD

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

engine.hpp

Merge branch 'master' into HEAD

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

main.cpp

Merge branch 'master' into HEAD

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