Brad Davis 6a06bf405a Merge remote-tracking branch 'upstream/master' into android		2018-01-16 18:24:44 -08:00
..
hifiCodec	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
hifiKinect	fix issue that caused jenkin to fail buiuling code	2017-06-13 00:37:32 +01:00
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	Modifying SDL initialization due to crash on OSX	2017-09-08 11:36:32 -07:00
hifiSixense	Cleaning some old tabs	2017-10-27 11:32:44 -07:00
hifiSpacemouse	avoid some more static/global QStrings in plugins	2016-11-13 11:29:19 -08:00
oculus	GLAD polish	2018-01-14 00:10:05 -08:00
oculusLegacy	Fix OSX Oculus plugin	2018-01-15 10:48:39 -08:00
openvr	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
pcmCodec	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
steamClient	quiet some warnings	2016-12-26 20:16:05 -08:00
CMakeLists.txt	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00