mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-04 18:11:01 -05:00
master merge conflict
This commit is contained in:
@@ -28,6 +28,7 @@ asset.require('examples/pointscloud')
|
||||
--- TESTELITEST ---
|
||||
|
||||
assetHelper.requireAll(asset, 'scene/milkyway/exoplanets')
|
||||
|
||||
assetHelper.requireAll(asset, 'scene/digitaluniverse')
|
||||
|
||||
-- Load default key bindings applicable to most scenes
|
||||
|
||||
Reference in New Issue
Block a user