Zach Fox a9197509d8 Merge pull request #10965 from CainFoool/avatar-scaler ... WL 21422 - Add a scale slider for avatar size		2017-07-14 10:30:33 -07:00
..
avatar	Eliminated to wiggle while pucks are enabled.	2017-06-26 14:09:10 -07:00
config
controllers	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
fonts	added new glyph	2017-07-06 00:45:59 +01:00
html
icons	Merge pull request #10886 from 1P-Cusack/21420	2017-07-14 10:06:45 -07:00
images	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
mention-sounds
meshes
qml	Merge pull request #10965 from CainFoool/avatar-scaler	2017-07-14 10:30:33 -07:00
QtWebEngine/UIDelegates
shaders
snapshot/img
sounds
styles
visage