Marc Zinnschlag 23ccee0124 Merge remote-tracking branch 'dieho/master' ...

Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp

2015-08-08 11:00:44 +02:00

..

bsatool

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

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

esmtool

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

2015-06-14 16:32:13 +02:00

essimporter

Fix cout/cerr mixup

2015-07-11 04:27:41 +02:00

launcher

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

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

mwiniimporter

Fix for possibly missing library on windows

2015-06-12 15:22:19 +02:00

niftest

Removed now unneeded script

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

opencs

Merge remote-tracking branch 'dieho/master'

2015-08-08 11:00:44 +02:00

openmw

Merge remote-tracking branch 'emperorarthur/anim_fail'

2015-08-08 10:47:46 +02: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

…