1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
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
..
2012-10-17 18:03:02 +02:00
2012-09-17 11:37:50 +04:00
2012-09-23 22:11:08 +04:00
2012-10-01 00:51:54 +04:00
2012-10-01 00:51:54 +04:00
2012-09-25 21:38:34 +02:00
2012-10-01 00:51:54 +04:00
2012-10-01 00:51:54 +04:00
2012-10-01 00:51:54 +04:00
2012-10-01 00:51:54 +04:00
2012-12-03 22:16:02 +01:00
2012-12-03 22:16:02 +01:00
2012-10-01 00:51:54 +04:00
2013-01-20 19:07:33 +01:00
2013-01-20 19:07:33 +01:00
2012-10-01 00:51:54 +04:00
2012-11-14 05:32:23 +01:00
2012-10-01 00:51:54 +04:00
2012-10-01 00:51:54 +04:00
2012-10-01 00:51:54 +04:00