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
..
model	Merge commit 'pull/upstream/678' into HEAD	2015-11-13 01:34:36 +01:00
view	changed instance selection model (primary selects, secondary toggles selection)	2015-10-29 11:27:01 +01:00
CMakeLists.txt	basic cell arrow rendering (shape is a placeholder)	2015-10-12 14:12:01 +02:00
editor.cpp	Merge branch 'mergetool'	2015-09-11 13:22:15 +02:00
editor.hpp	added UI for merge tool (merge tool itself is still missing)	2015-08-06 12:52:10 +02:00
main.cpp	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00