mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Solve merge conflicts.

Browse Source
This commit is contained in:
Kalle Bladin
2016-06-07 12:54:52 -04:00
parent 05e0e8254b 146b71e129
commit 012bcaefaf
234 changed files with 262157 additions and 2398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/main.cpp
View File

@@ -30,6 +30,7 @@
#include <ghoul/misc/dictionary.h>
#include <ghoul/lua/ghoul_lua.h>
// test files
//#include <test_common.inl>
//#include <test_spicemanager.inl>
//#include <test_scenegraphloader.inl>
@@ -39,6 +40,7 @@
//#include <test_luaconversions.inl>
//#include <test_powerscalecoordinates.inl>
//#include <test_angle.inl>
//#include <test_latlonpatch.inl>
//#include <test_gdalwms.inl>
@@ -46,6 +48,8 @@
//#include <test_concurrentqueue.inl>
//#include <test_concurrentjobmanager.inl>
//#include <test_screenspaceimage.inl>
//#include <test_iswamanager.inl>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>