Alezia Kurdis 1671887602 Merge branch 'master' into kasen/core		2020-04-29 12:02:12 -04:00
..
assets	Add screenshare zone-property - WIP	2019-11-25 13:22:35 -08:00
entityList	Merge pull request #16461 from ctrlaltdavid/DEV-2649	2019-11-08 10:28:24 -08:00
entityProperties/html	To avoid a regression at some point	2020-04-27 22:49:42 -04:00
entitySelectionTool	Enable Alt action for cloning on Mac	2019-11-13 10:48:08 +13:00
modules	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
qml	Fixed path to tabletAssetServer in HMD, simplifiedUI system folder	2019-07-09 13:02:54 -07:00
edit.js	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00