Mark Siewert 8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/cellstore.hpp apps/openmw/mwworld/containerstore.cpp apps/openmw/mwworld/localscripts.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm_store/reclists.hpp components/esm_store/store.cpp extern/shiny - Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp. - NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.		2012-11-25 14:12:44 +01:00
..
esmtool	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2012-11-25 14:12:44 +01:00
launcher	several missing includes	2012-11-14 05:32:23 +01:00
mwiniimporter
openmw	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2012-11-25 14:12:44 +01:00
openmw_test_suite
doc.hpp