cc9cii 740c8bc6f1 Merge branch 'master' into cc9cii ... Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/view/world/dialoguesubview.cpp		2015-07-27 10:53:39 +10:00
..
autocalc	Address review comments.	2015-06-26 07:48:48 +10:00
bsa
compiler
config
contentselector
esm	Handle encoding conversions when saving TES3 header (Fixes #2727)	2015-06-26 20:16:32 +02:00
esmterrain
files
fontloader
interpreter
loadinglistener
misc
nif
nifbullet
nifcache
nifogre
nifoverrides
ogreinit
process
settings
terrain
to_utf8
translation
version
widgets
CMakeLists.txt	Address review feedback.	2015-06-25 13:32:22 +10:00
doc.hpp