From 10830cf68cdfab6fc5fe1cf28419704889c6184a Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 26 Apr 2020 14:50:43 -0700 Subject: [PATCH] recover from rebase errors --- cmake/ports/hifi-client-deps/CONTROL | 2 +- scripts/defaultScripts.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/ports/hifi-client-deps/CONTROL b/cmake/ports/hifi-client-deps/CONTROL index 5b9b0bcce0..7070cb6fb9 100644 --- a/cmake/ports/hifi-client-deps/CONTROL +++ b/cmake/ports/hifi-client-deps/CONTROL @@ -1,4 +1,4 @@ Source: hifi-client-deps Version: 0.1 Description: Collected dependencies for High Fidelity applications -Build-Depends: hifi-deps, glslang, nlohmann-json, openvr (windows), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), vulkanmemoryallocator, aristo (windows), sranipal (windows) +Build-Depends: hifi-deps, aristo (windows), glslang, liblo (windows), nlohmann-json, openvr (windows), quazip (!android), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), sranipal (windows), vulkanmemoryallocator diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 0efabd7773..a19bb9c41a 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -34,6 +34,7 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/emote.js", "system/miniTablet.js", "system/audioMuteOverlay.js", + "system/inspect.js", "system/keyboardShortcuts/keyboardShortcuts.js", "system/hand-track-walk.js" ];