Brad Hefta-Gaub 9a3b6bf081 Merge pull request #7858 from Atlante45/remove-deprecated-entity-props ... removed dead code for overlays/entities glow level		2016-05-18 09:14:26 -07:00
..
developer	Merge pull request #7859 from samcake/lemon	2016-05-12 15:09:50 -07:00
system	Merge pull request #7858 from Atlante45/remove-deprecated-entity-props	2016-05-18 09:14:26 -07:00
tutorials	d'oh	2016-05-09 15:28:25 -07:00
defaultScripts.js	Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer	2016-05-09 09:26:28 -07:00