Brad Hefta-Gaub 1b7ec7d61e Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements ... Conflicts: libraries/avatars/src/AvatarData.cpp		2017-02-23 13:50:16 -08:00
..
developer	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements	2017-02-23 13:50:16 -08:00
system	Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight	2017-02-22 18:07:38 -08:00
tutorials	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00
defaultScripts.js	Change the "Mute" tablet button to "Audio"	2017-02-11 22:40:19 +13:00