Alexander Bock f1791d9816 Merge branch 'develop' into feature/downloadmanager ...

Conflicts:
	openspace.cfg
	src/engine/openspaceengine.cpp
	support/cmake/support_macros.cmake

2015-06-10 02:13:32 +02:00

..

configurationmanager.h

Starting to clean out constants.h file by moving constants into the relevant classes

2015-05-20 16:32:28 +02:00

downloadmanager.h

Rename DownloadEngine to DownloadManager

2015-05-27 17:14:20 +02:00

logfactory.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

moduleengine.h

Modularized the base classes

2015-05-20 19:19:10 +02:00

openspaceengine.h

Replace commandline argument with automatically detecting the supported OpenGL version

2015-05-28 20:33:22 +02:00