Merge from globebrowsing

This commit is contained in:
Erik Broberg
2016-08-17 20:25:58 -04:00
55 changed files with 364 additions and 133 deletions
@@ -175,4 +175,4 @@ void TriangleSoup::drawUsingActiveProgram() {
glBindVertexArray(0);
}
} // namespace openspace
} // namespace openspace