Marc Zinnschlag 130af28fa5 Merge remote-tracking branch 'cc9cii/master' ...

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp

2014-05-25 12:07:09 +02:00

..

bsatool

Fix bsatool warning

2013-12-05 15:46:33 +01:00

esmtool

Dialogue merging

2014-05-18 15:25:16 +02:00

launcher

the same for data-local entry

2014-05-22 01:13:27 +04:00

mwiniimporter

missing #include <iostream> in mwiniimporter

2014-05-23 08:41:49 -04:00

opencs

Merge remote-tracking branch 'greye/widechar'

2014-05-23 07:48:26 +02:00

openmw

Merge remote-tracking branch 'cc9cii/master'

2014-05-25 12:07:09 +02:00

openmw_test_suite

Remove unused file_finder

2014-05-15 21:36:24 +02:00

doc.hpp

…