Marc Zinnschlag 55dfe48ef7 copy meta data from game file when merging ...

(cherry picked from commit 47dd9505a9464dc5c947f409c3c4a80cf4d8e395)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/data.cpp

2015-11-01 13:34:41 +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

copy meta data from game file when merging

2015-11-01 13:34:41 +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

…