mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-24 13:59:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Erik Broberg
2016-04-18 20:36:01 -04:00
parent 4073f4e6cb 63f8405c0a
commit 4f873e3f97
9 changed files with 232 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/main.cpp
View File

@@ -38,7 +38,8 @@
#include <test_twmstileprovider.inl>
//#include <test_luaconversions.inl>
//#include <test_powerscalecoordinates.inl>
#include <test_latlonpatch.inl>
//#include <test_latlonpatch.inl>
//#include <test_texturetileset.inl>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>