Pieter van der Kloet ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext ...

Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp

2013-02-15 15:21:14 +01:00

..

esmtool

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2013-01-25 18:22:01 +01:00

launcher

Merge remote-tracking branch 'upstream/next' into settingsnext

2013-02-15 15:21:14 +01:00

mwiniimporter

Fix game files import

2013-02-06 00:51:05 +01:00

opencs

Merge remote-tracking branch 'ace/win-fixes' into next

2013-02-12 15:42:45 +01:00

openmw

Merge remote-tracking branch 'ace/win-fixes' into next

2013-02-12 15:42:45 +01:00

openmw_test_suite

Added fix for not visible pthreads functions for linker with glibc 2.15

2012-08-20 00:18:40 +03:00

doc.hpp

first set of additional doxygen comments

2010-09-25 15:03:53 +02:00