8 commits

Author	SHA1	Message	Date
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
scrawl	67bd6cd708	Remove empty line at the beginning of files ... git ls-files -z | xargs -0 sed -i '1{/^$/d}'	2015-08-18 23:06:12 +02:00
Stanislav Bas	13bb6be238	Load methods (for ESM records) accept a deleted flag in OpenCS	2015-07-22 22:17:26 +03:00
Stanislav Bas	74a055f3cc	Remove NAME and DELE handling from IdCollection	2015-07-13 10:40:11 +03:00
Marc Zinnschlag	d8440e1fdc	implemented reference record merging	2014-05-20 09:02:22 +02:00
Marc Zinnschlag	9f0b34eae0	fixed reference loading code (editor)	2013-08-29 13:27:54 +02:00
Marc Zinnschlag	1e60ad3cd6	Promoted references to a top level record internally. ... Note: This does not change the structure of the ESX format.	2013-06-08 12:45:13 +02:00
Marc Zinnschlag	0c33dd86d5	added basic cell table	2013-04-14 17:04:55 +02:00