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

..

.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

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

2013-01-25 18:22:01 +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

post merge fix

2012-12-18 12:36:26 +01:00

record.hpp

Remove tabs as requested. Sorry about that, thought I already

2012-10-09 19:41:45 -04:00