Stanislav Bas f4587e48f3 Load methods (for ESM records) accept a deleted flag in OpenCS ...

(cherry picked from commit 13bb6be2383c808084eabed0cb1bfb3b9749e55a)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp

2015-12-05 11:22:51 +11:00

..

model

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

2015-12-05 11:22:51 +11:00

view

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

CMakeLists.txt

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

editor.cpp

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

editor.hpp

added UI for merge tool (merge tool itself is still missing)

2015-11-01 13:22:42 +11:00

main.cpp

Remove empty line at the beginning of files

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