samcake 853f31f6ea Merge branch 'master' of https://github.com/highfidelity/hifi into skin		2016-07-20 10:49:27 -07:00
..
developer	Adjust qml positions and fix one shader bug	2016-07-19 13:20:19 -07:00
system	Merge branch 'fix-duplicate-teleport-target-overlays' of github.com:thoys/hifi into fix-duplicate-teleport-target-overlays	2016-07-20 03:12:26 +02:00
tutorials	Removed button color declarations to make icons visible.	2016-07-14 15:59:47 -07:00
defaultScripts.js	add ignore to defaultScripts	2016-07-13 15:06:31 -07:00