mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 14:58:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Erik Broberg
2016-04-25 16:14:04 -04:00
parent e6195486ae c6c6e558db
commit 1799e2b488
48 changed files with 508 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/main.cpp
View File

@@ -33,16 +33,16 @@
//#include <test_common.inl>
//#include <test_spicemanager.inl>
//#include <test_scenegraphloader.inl>
//#include <test_chunknode.inl>
//#include <test_lrucache.inl>
//#include <test_twmstileprovider.inl>
#include <test_chunknode.inl>
#include <test_lrucache.inl>
#include <test_twmstileprovider.inl>
//#include <test_luaconversions.inl>
//#include <test_powerscalecoordinates.inl>
//#include <test_angle.inl>
//#include <test_latlonpatch.inl>
//#include <test_texturetileset.inl>
#include <test_gdalwms.inl>
//#include <test_gdalwms.inl>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>