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
..
.gitignore	Moved esmtool to apps/	2010-07-21 13:52:28 +02:00
CMakeLists.txt	Human readable labels for many records types. Human readable flags	2012-10-10 22:00:44 -04:00
esmtool.cpp	- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned).	2012-11-10 21:43:41 +01:00
labels.cpp	Removed minor comments left in by accident.	2012-10-10 22:15:19 -04:00
labels.hpp	Human readable labels for many records types. Human readable flags	2012-10-10 22:00:44 -04:00
record.cpp	ESM tool fix	2012-11-22 17:23:25 +01:00
record.hpp	Remove tabs as requested. Sorry about that, thought I already	2012-10-09 19:41:45 -04:00