David Rowe 96767c1103 Merge branch 'master' into M17217-b ... # Conflicts: # plugins/openvr/src/OpenVrDisplayPlugin.cpp		2018-08-08 10:43:58 +12:00
..
hifiCodec	add a client only option to cmake	2018-03-20 14:20:58 -07:00
hifiKinect
hifiLeapMotion
hifiNeuron
hifiSdl2	enable gamepad by default	2018-06-05 12:01:06 -07:00
hifiSixense
hifiSpacemouse
oculus	Merge branch 'master' into M17217-a	2018-08-04 09:44:39 +12:00
oculusLegacy
openvr	Merge branch 'master' into M17217-b	2018-08-08 10:43:58 +12:00
pcmCodec	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
steamClient
CMakeLists.txt	disable the sixense plugin by default	2018-03-15 13:53:10 -07:00