Marc Zinnschlag e4381c3ec8 added merge operation (doesn't do anything yet) ...

(cherry picked from commit 904ad949524864239f4b1f428d03a947360728a0)

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

2015-11-01 13:25:34 +11:00

..

bsatool

Support MSVC 2015. Tested(*) with updated dependencies:

2015-08-12 06:50:22 +10:00

esmtool

Merge remote-tracking branch 'cc9cii/master'

2015-06-14 12:50:10 +02:00

essimporter

Use the correct format specifier for ess-imported savegames

2015-10-25 11:36:20 +11:00

launcher

Fix config file priority in the launcher to match OpenMW

2015-07-27 15:12:13 +10:00

mwiniimporter

Fix for possibly missing library on windows

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

niftest

Removed now unneeded script

2015-09-08 06:19:08 +10:00

opencs

added merge operation (doesn't do anything yet)

2015-11-01 13:25:34 +11:00

openmw

Refuse loading save games of unknown format

2015-10-25 11:35:53 +11: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

…