mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-10 15:39:02 +00:00
Code Issues Projects Releases Wiki Activity
ee27e3bb58
OpenMW/apps/esmtool
History
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
CMakeLists.txt
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
record.cpp post merge fix 2012-12-18 12:36:26 +01:00
record.hpp