Marc Zinnschlag a445683312 Merge branch 'mergetool' ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp

2015-09-11 13:22:15 +02:00

..

bsatool

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-13 21:11:24 +02:00

esmtool

refactored loading of land data

2015-08-31 16:13:26 +02:00

essimporter

Add documentation for ACTN ess-record (activation flags)

2015-09-07 23:27:14 +02:00

launcher

Fix the launcher's version label for builds with no git commit info

2015-08-06 02:54:47 +02:00

mwiniimporter

Fix for possibly missing library on windows

2015-06-12 15:22:19 +02:00

niftest

Removed now unneeded script

2015-08-07 20:53:43 -04:00

opencs

Merge branch 'mergetool'

2015-09-11 13:22:15 +02:00

openmw

Merge branch 'mergetool'

2015-09-11 13:22:15 +02:00

openmw_test_suite

UnitTests: add another dialogue keyword test

2015-01-10 00:29:07 +01:00

wizard

Build fixes for windows

2015-06-15 16:48:18 +02:00

doc.hpp

…