History

Merge branch 'master' of github.com:highfidelity/hifi into audio/parity

Zach Pomerantz committed 9 years ago

Commit a8f69bb2 parents e7da007 ae81738385 files · +9641 −4012Browse files

Showing the changes to scripts/defaultScripts.js (1 of 385 files). Show all

Unified · Split

scripts/defaultScripts.js+2−1
@@ -31,7 +31,8 @@ var DEFAULT_SCRIPTS_COMBINED = [ · 30 unmodified lines
31 "system/tablet-ui/tabletUI.js"31 "system/tablet-ui/tabletUI.js"
32];32];
33var DEFAULT_SCRIPTS_SEPARATE = [33var DEFAULT_SCRIPTS_SEPARATE = [
34 "system/controllers/controllerScripts.js"34 "system/controllers/controllerScripts.js",
35 "system/chat.js"
35];36];
36 37
37// add a menu item for debugging38// add a menu item for debugging