Mark Siewert 1f961d575e Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ...

Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp

2012-10-07 20:35:54 +02:00

..

mwbase

fixed GMST string handling in GUI

2012-10-01 10:03:49 +02:00

mwclass

initial resolving

2012-10-01 00:23:49 +04:00

mwdialogue

initial resolving

2012-10-01 00:23:49 +04:00

mwgui

fixed GMST string handling in GUI

2012-10-01 10:03:49 +02:00

mwinput

enableRestMenu & enableLevelupMenu

2012-09-15 20:18:41 +02:00

mwmechanics

initial resolving

2012-10-01 00:23:49 +04:00

mwrender

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2012-10-07 20:35:54 +02:00

mwscript

initial resolving

2012-10-01 00:23:49 +04:00

mwsound

Merge remote-tracking branch 'greye/record_saving'

2012-10-01 09:50:20 +02:00

mwworld

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2012-10-07 20:35:54 +02:00

CMakeLists.txt

Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap

2012-09-20 17:41:14 +02:00

config.hpp.cmake

another minor correction (fixing the previous one)

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

doc.hpp

first set of additional doxygen comments

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

engine.cpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2012-10-07 20:35:54 +02:00

engine.hpp

Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.

2012-10-07 20:00:55 +02:00

main.cpp

Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.

2012-10-07 20:00:55 +02:00