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
..
doc	Merge commit 'pull/upstream/678' into HEAD	2015-11-13 01:34:36 +01:00
filter	Remove empty line at the beginning of files	2015-08-18 23:06:12 +02:00
settings	split virtual select button into two buttons (primary select and seconadry select)	2015-10-29 11:20:06 +01:00
tools	Add a check for scale value of 0. Should resolve bug #2880.	2015-11-01 11:23:28 +11:00
world	Merge commit 'pull/upstream/678' into HEAD	2015-11-13 01:34:36 +01:00