History

Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll

howard-stearns committed 8 years ago

Commit d2cf0422 parents d68415c 044d14212 files · +407 −31Browse files

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

Unified · Split

scripts/defaultScripts.js+1−1
@@ -33,7 +33,7 @@ var DEFAULT_SCRIPTS_COMBINED = [ · 32 unmodified lines
33 "system/emote.js"33 "system/emote.js"
34];34];
35var DEFAULT_SCRIPTS_SEPARATE = [35var DEFAULT_SCRIPTS_SEPARATE = [
36 "system/controllers/controllerScripts.js"36 "system/controllers/controllerScripts.js",
37 //"system/chat.js"37 //"system/chat.js"
38];38];
39 39