Ryan Downe Karpf 3f151cb3d7 Merge pull request #9483 from Atlante45/fix/rescale ... Fix Edit.js rescale for decimal values		2017-01-23 15:44:10 -08:00
..
developer	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-18 17:00:20 -08:00
system	Merge pull request #9483 from Atlante45/fix/rescale	2017-01-23 15:44:10 -08:00
tutorials	remove commented code	2017-01-18 02:57:13 -05:00
defaultScripts.js	Enabled the ability to have other marketplaces.	2017-01-07 08:17:13 -08:00