Mark Siewert dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/esmreader.hpp - Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.		2013-01-25 18:22:01 +01:00
..
mwbase	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-01-25 18:22:01 +01:00
mwclass	NPC: take stats from NPDT12 into account	2013-01-20 17:44:08 +01:00
mwdialogue	Dialogue: do not filter on disposition for creatures	2013-01-24 19:43:21 +01:00
mwgui	DialogueWindow: do not execute onFrame() when not visible	2013-01-15 00:59:48 +01:00
mwinput	Merge branch 'master' into videoplayback	2013-01-07 13:25:15 +01:00
mwmechanics	Issue #479: Use magnitude specified when adding disease	2013-01-13 14:52:55 +01:00
mwrender	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-01-25 18:22:01 +01:00
mwscript	fix spelling in comment	2013-01-16 04:19:16 +01:00
mwsound	Use const references where appropriate	2013-01-15 12:07:15 -08:00
mwworld	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-01-25 18:22:01 +01:00
CMakeLists.txt	Merge branch 'master' into videoplayback	2013-01-07 13:25:15 +01: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	2013-01-25 18:22:01 +01:00
engine.hpp	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-01-25 18:22:01 +01:00
main.cpp	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-01-25 18:22:01 +01:00