Merge branch 'master' of github.com:CraftsmanMG/hifi

This commit is contained in:
Artur Gomes 2017-08-16 18:52:39 +01:00
commit 9d87954d71
6 changed files with 1 additions and 0 deletions

0
interface/resources/meshes/mannequin/Eyes.ktx Executable file → Normal file
View file

View file

View file

View file

View file

View file

@ -32,6 +32,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
];
var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js",
"system/fingerPaint/fingerPaint.js"
// "system/chat.js"
"system/fingerPaint/fingerPaint.js"
];