Jonas Strandstedt db141e8e86 Merge branch 'develop' into bug/abuffershadersupdater ...

Conflicts:
	ext/ghoul
	openspace.cfg
	src/abuffer/abuffer.cpp
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp

2014-10-21 14:54:48 +02:00

..

ghoul @ 999399a275

Merge branch 'develop' into bug/abuffershadersupdater

2014-10-21 14:54:48 +02:00

kameleon @ 95eee93aab

Update Kameleon submodule

2014-05-15 00:42:49 +02:00

spice @ 38f7fe9fe4

Updated the Spice library

2014-05-02 17:00:11 +02:00

cotire.cmake

Added cotire to speed up compilation

2014-10-16 15:38:59 +02:00

FindSGCT.cmake

linux fix

2014-03-14 16:58:32 -04:00

FindXi.cmake

Fixed linux issues by adding CMake find_package commands

2014-02-20 11:24:30 -05:00

FindXRandR.cmake

Fixed linux issues by adding CMake find_package commands

2014-02-20 11:24:30 -05:00

tinythread.cpp

Cleaned up source files

2014-02-11 09:20:01 +01:00

tinythread.h

Cleaned up source files

2014-02-11 09:20:01 +01:00