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
..
debugging	wire up bandwidth buget to sorting	2017-02-21 16:22:22 -08:00
libraries
tests	remove debug and fix bug in test script	2017-02-10 10:09:03 -08:00
utilities	remove debugger line	2017-02-21 20:20:23 +01:00