Brad Hefta-Gaub 305e1ae1d2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements		2017-02-17 10:18:53 -08:00
..
resources	wire up thread count to settings, tweak stats	2017-02-15 13:00:30 -08:00
src	Ban only by machine fingerprint, when possible	2017-02-16 09:50:56 -07:00
CMakeLists.txt	inform gatekeeper immediately when kicking someone	2017-02-13 18:25:00 -07:00