Ryan Huffman d108fabd0b Update the name of the collision shapes used in edit.js properties ... Update the names to be consistent with what is shown on the add model dialog.		2017-01-23 13:56:48 -08:00
..
developer	Merge branch 'master' of https://github.com/highfidelity/hifi into meta	2017-01-18 17:00:20 -08:00
system	Update the name of the collision shapes used in edit.js properties	2017-01-23 13:56:48 -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