Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers

This commit is contained in:
Seth Alves 2016-08-25 10:41:53 -07:00
commit 7b1db2c8a9

View file

@ -28,7 +28,7 @@ var DEFAULT_SCRIPTS = [
"system/controllers/squeezeHands.js",
"system/controllers/grab.js",
"system/controllers/teleport.js",
"system/controllers/toggleAdvancedMovementForHandControllers.js,
"system/controllers/toggleAdvancedMovementForHandControllers.js",
"system/dialTone.js",
"system/firstPersonHMD.js",
"system/snapshot.js"