Brad Hefta-Gaub 84eca0159e Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval ... Conflicts: tests/networking/src/ResourceTests.cpp		2016-12-29 16:42:52 -08:00
..
hifiCodec
hifiKinect
hifiNeuron
hifiSdl2
hifiSixense
hifiSpacemouse
oculus	Make getHardwareStats thread safe	2016-12-29 11:13:55 -08:00
oculusLegacy
openvr	audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate	2016-12-29 08:53:37 -08:00
pcmCodec
steamClient	quiet some warnings	2016-12-26 20:16:05 -08:00
CMakeLists.txt