mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-27 07:18:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/downloadmanager

Browse Source 
Conflicts:
	openspace.cfg
	src/engine/openspaceengine.cpp
	support/cmake/support_macros.cmake
This commit is contained in:
Alexander Bock
2015-06-10 02:13:32 +02:00
parent 38c2477492 726a8e84ef
commit f1791d9816
59 changed files with 1866 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/engine/openspaceengine.h
View File

@@ -59,7 +59,7 @@ namespace scripting {
class OpenSpaceEngine {
public:
static bool create(int argc, char** argv, std::vector<std::string>& sgctArguments, std::string& openGlVersion);
static bool create(int argc, char** argv, std::vector<std::string>& sgctArguments);
static void destroy();
static OpenSpaceEngine& ref();