SamGondelman 4c55849290 merge from master		2017-08-10 15:43:23 -07:00
..
hifiCodec	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
hifiKinect
hifiLeapMotion	Update make file per master changes	2017-06-24 09:53:58 +12:00
hifiNeuron	Bail in Neuron plugin update if plugin not enabled	2017-06-26 15:58:14 +12:00
hifiSdl2	User-friendly SDL2 controller name	2017-06-29 10:03:58 +12:00
hifiSixense	re-enable sixense and update comment	2017-08-10 12:03:56 -07:00
hifiSpacemouse
oculus	merge from master	2017-08-04 12:17:54 -07:00
oculusLegacy	add midi to 3 CMakeLists.txt for linking	2017-07-26 08:41:26 -07:00
openvr	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
pcmCodec	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
steamClient
CMakeLists.txt