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

Merge branch 'master' into feature/general-performance

Browse Source 
# Conflicts:
#	apps/OpenSpace/main.cpp
#	modules/server/src/topics/timetopic.cpp
This commit is contained in:
Alexander Bock
2020-09-04 13:49:00 +02:00
parent b99a4c7390 20d1e391cb
commit 00a00c9cc8
18 changed files with 289 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/util/webgui.asset
+1 -1
View File
@@ -3,7 +3,7 @@ asset.require('./static_server')
local guiCustomization = asset.require('customization/gui')
-- Select which commit hashes to use for the frontend and backend
local frontendHash = "6673d083bf2629502ce7f809610509f29ad444b7"
local frontendHash = "e520f14d3fffc915b7b900f4fc6d888070f458c4"
local dataProvider = "data.openspaceproject.com/files/webgui"
local frontend = asset.syncedResource({