Seth Alves 71ab6a1a84 fix a couple of problems related to grabbing tablet while edit.js is active ... Conflicts: scripts/system/controllers/handControllerGrab.js		2017-02-24 11:38:42 -08:00
..
developer	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements	2017-02-23 13:50:16 -08:00
system	fix a couple of problems related to grabbing tablet while edit.js is active	2017-02-24 11:38:42 -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