Files
OpenSpace/include
Matthew Territo d7dddf5352 Merge commit '8ddc794cda8cc91c6c7cce5119aaaf0a2530f5c8' into feature/websocketnavigation
* commit '8ddc794cda8cc91c6c7cce5119aaaf0a2530f5c8':
  Feature/alex is flying (#729)
  Update ghoul repository
  Reenable the atmosphere on master
  Remove Clang warnings
  Feature/cmake cleanup (#727)
  Fix TaskRunner related issues

# Conflicts:
#	src/CMakeLists.txt
2018-10-08 16:44:47 -06:00
..