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

..

bsatool

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-06-13 21:11:24 +02:00

esmtool

Merge commit 'pull/upstream/678' into HEAD

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

essimporter

Merge commit 'pull/upstream/678' into HEAD

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

launcher

Fix the launcher's version label for builds with no git commit info

2015-08-06 02:54:47 +02:00

mwiniimporter

Remove old FPS setting code

2015-11-07 00:13:13 +01:00

niftest

Removed now unneeded script

2015-08-07 20:53:43 -04:00

opencs

Merge commit 'pull/upstream/678' into HEAD

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

openmw

Merge commit 'pull/upstream/678' into HEAD

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

openmw_test_suite

UnitTests: add another dialogue keyword test

2015-01-10 00:29:07 +01:00

wizard

Build fixes for windows

2015-06-15 16:48:18 +02:00

doc.hpp

…