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
..
esmtool	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-01-25 18:22:01 +01:00
launcher	to_utf8, Utf8Encoder: pass encoding as constructor parameter	2013-01-06 01:37:58 +01:00
mwiniimporter	more string lowercase	2013-01-09 20:51:52 +01:00
opencs	disabling dialogue sub-views for now	2013-01-22 11:50:08 +01:00
openmw	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-01-25 18:22:01 +01:00
openmw_test_suite	Added fix for not visible pthreads functions for linker with glibc 2.15	2012-08-20 00:18:40 +03:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00