Brad Hefta-Gaub 5d90b7b1b7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements		2017-02-15 16:15:57 -08:00
..
resources	wire up thread count to settings, tweak stats	2017-02-15 13:00:30 -08:00
src	Merge pull request #9669 from davidkelly/dk/2656	2017-02-15 15:13:10 -08:00
CMakeLists.txt	inform gatekeeper immediately when kicking someone	2017-02-13 18:25:00 -07:00