Jonas Strandstedt 82ff7fa984 Merge branch 'develop' into stars ...

Conflicts:
	include/openspace/util/constants.h
	shaders/pscstandard_fs.glsl
	shaders/pscstandard_vs.glsl
	src/interaction/interactionhandler.cpp
	src/main.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
	src/util/factorymanager.cpp

2014-09-24 15:39:22 +02:00

..

ghoul @ 08152443a9

Merge branch 'develop' into stars

2014-09-24 15:39:22 +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

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