David Back d1bb11562b Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip		2018-04-19 09:36:19 -07:00
..
+android
assets	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
commerce	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
controllers	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-19 09:36:19 -07:00
html	Don't allow users to spam Still Only snapshot capture	2018-04-17 12:39:46 -07:00
libraries	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-19 09:36:19 -07:00
marketplaces	Bugfixes per QA	2018-04-16 11:53:37 -07:00
particle_explorer
tablet-ui
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarFinderBeacon.js
away.js
bubble.js	Prevent the Bubble icon from ever blinking as per 14026	2018-04-10 16:00:35 -07:00
chat.js
dialTone.js
directory.js
edit.js	Merge pull request #12929 from misslivirose/fix/misc-edit-bugs	2018-04-18 13:46:38 -07:00
emote.js
fingerPaint.js
firstPersonHMD.js
generalSettings.js
goto.js
help.js
hmd.js
makeUserConnection.js
menu.js
mod.js
nameTag.js
notifications.js
pal.js	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
progress.js
run.js
snapshot.js	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
tablet-goto.js
tablet-users.js
voxels.js