Jonas Strandstedt 0118e1f786 Merge branch 'develop' into SceneGraphLoader ...

Conflicts:
	ext/ghoul
	src/openspaceengine.cpp

2014-03-13 11:44:28 -04:00

..

ghoul @ 8c1bd08e06

Merge branch 'develop' into SceneGraphLoader

2014-03-13 11:44:28 -04:00

spice @ 5419d02cf0

Added release/debug support for mac/linux version

2014-02-20 12:26:42 -05:00

FindSGCT.cmake

Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

2014-02-25 21:00:42 -05: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