Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp		2012-11-10 15:44:44 +01:00
..
bsa	consider all files in Splash directory	2012-10-17 12:39:45 +02:00
compiler
esm	Merge branch 'master' into dialogue	2012-11-10 15:44:44 +01:00
file_finder
files	Fixed an issue with some paths not concatenating properly.	2012-09-09 16:28:02 +02:00
interpreter
misc
nif	compatibility fix	2012-08-05 00:06:19 +02:00
nifbullet	fix BulletShapeLoader namespace	2012-11-08 18:48:07 +01:00
nifogre	Use a multimap to store the text keys	2012-09-28 23:20:15 -07:00
nifoverrides
settings	settings.cpp: fix std::runtime_error compile error	2012-09-05 23:39:58 +02:00
terrain	remove underscores from filenames in esm	2012-09-23 23:12:10 +04:00
to_utf8	rename getASCII() to getLegacyEnc()	2012-09-23 22:20:18 +04:00
CMakeLists.txt	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
doc.hpp