scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD ...

Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp

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

..

blacklist.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

blacklist.hpp

consider script blacklist in OpenCS verifier

2014-07-21 12:15:21 +02:00

document.cpp

silenced a warning

2015-08-25 11:39:43 +02:00

document.hpp

flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)

2015-08-23 12:37:45 +02:00

documentmanager.cpp

Merge branch 'mergetool'

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

documentmanager.hpp

create merged document and open a view for it (document is still empty at this point)

2015-08-16 15:24:48 +02:00

loader.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

loader.hpp

display record count in loading window

2014-06-26 11:41:21 +02:00

messages.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

messages.hpp

refactored mapping from message severity enum to string

2015-07-16 14:46:02 +02:00

operation.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

operation.hpp

create merged document and open a view for it (document is still empty at this point)

2015-08-16 15:24:48 +02:00

operationholder.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

operationholder.hpp

standarised on the use of the Message struct when passing operations messages around

2015-06-20 17:56:42 +02:00

runner.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

runner.hpp

Fixed editor operation multi-threading (Fixes #923)

2015-03-14 12:00:24 +01:00

saving.cpp

Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records

2015-08-22 12:57:39 +02:00

saving.hpp

text encoding configuration (was using hardcoded settings before)

2014-05-12 10:32:57 +02:00

savingstages.cpp

Merge commit 'pull/upstream/678' into HEAD

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

savingstages.hpp

Load methods (for ESM records) accept a deleted flag in OpenCS

2015-07-22 22:17:26 +03:00

savingstate.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

savingstate.hpp

fixed ref num saving in non-wide format

2015-01-22 13:41:09 +01:00

stage.cpp

Remove empty line at the beginning of files

2015-08-18 23:06:12 +02:00

stage.hpp

framework for accessing user settings in operation stages

2015-06-20 16:20:31 +02:00

state.hpp

replaced State_Compiling (not requried anymore) with State_Merging

2015-07-30 11:49:24 +02:00