Marc Zinnschlag 4a02563708 Merge branch 'master' into buttons ... Conflicts: apps/opencs/view/render/instancemode.cpp		2016-01-19 13:59:24 +01:00
..
bsatool	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-13 21:11:24 +02:00
esmtool	esmtool fix	2015-11-14 00:27:59 +01:00
essimporter	Fix cppcheck warnings	2016-01-03 20:19:38 +01:00
launcher	Make setup method of MainDialog class private	2016-01-16 06:43:45 -05:00
mwiniimporter	Fix cppcheck warnings	2016-01-03 20:19:38 +01:00
niftest	Removed now unneeded script	2015-08-07 20:53:43 -04:00
opencs	Merge branch 'master' into buttons	2016-01-19 13:59:24 +01:00
openmw	Correction	2016-01-15 16:34:57 +01:00
openmw_test_suite	Adjust tests to work with esm_rewrite branch.	2015-11-14 00:27:59 +01:00
wizard	InstallationPage: properly exit the QThread (Fixes #2210)	2015-12-08 21:41:35 +01:00
doc.hpp