Howard Stearns 113670e33b Merge pull request #12638 from zfox23/commerce_upgrades_1 ... Commerce: Item Updates!		2018-03-22 15:40:22 -07:00
..
+android	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-15 17:11:40 -03:00
assets
commerce	Final touches?	2018-03-14 10:58:18 -07:00
controllers	fix controller dispatacher error	2018-03-05 09:39:26 -08:00
html	Small update to dot before merging in filterBar	2018-03-14 09:45:42 -07:00
libraries	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
marketplaces	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-16 13:24:17 -07:00
particle_explorer	[Case 4315] Ensures that Particle Tab Color Pickers obey colpick visual styling.	2018-03-01 16:42:56 -05:00
tablet-ui	tablet scale and position changes	2018-03-07 10:02:35 -08:00
attachedEntitiesManager.js
audio.js
audioMuteOverlay.js
audioScope.js
avatarFinderBeacon.js
away.js
bubble.js
chat.js
dialTone.js
directory.js
edit.js	Merge pull request #12692 from highfidelity/stable	2018-03-22 15:08:30 -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
progress.js
run.js
snapshot.js
tablet-goto.js
tablet-users.js
voxels.js