mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 23:09:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

solve merge conflict with develop

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-03 17:11:28 -04:00
parent 57cd5c0bf7 e4a8683aba
commit 0d49076c54
109 changed files with 1061 additions and 3632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/engine/openspaceengine.h
+2 -2
View File
@@ -104,7 +104,7 @@ public:
void enableBarrier();
void disableBarrier();
void runSettingsScripts();
void runPostInitializationScripts(const std::string& sceneDescription);
private:
OpenSpaceEngine(std::string programName, std::unique_ptr<WindowWrapper> windowWrapper);
@@ -115,7 +115,7 @@ private:
bool loadSpiceKernels();
void loadFonts();
void runScripts(const ghoul::Dictionary& scripts);
void runStartupScripts();
void runPreInitializationScripts(const std::string& sceneDescription);
void configureLogging();
// Components