David Rowe a34e1f69e0 Merge branch 'master' into M19345 ... # Conflicts: # scripts/system/controllers/controllerModules/nearParentGrabOverlay.js		2018-11-09 14:26:29 +13:00
..
+android	Show stats button only in debug mode. Add isDebugMode to Script public interface	2018-05-29 17:21:44 -03:00
developer	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-11-07 12:07:15 -08:00
modules	Fix four bugs; truncate some logs	2018-11-01 10:29:38 -07:00
system	Merge branch 'master' into M19345	2018-11-09 14:26:29 +13:00
tutorials	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
defaultScripts.js	Merge pull request #13904 from alexiamandeville/menu-updates	2018-10-24 19:41:22 -07:00