David Rowe 07697c5083 Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.		2017-07-01 11:19:00 +12: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	User-friendly SDL2 controller name	2017-06-29 10:03:58 +12:00
hifiSixense	Code review	2017-06-29 08:58:27 +12:00
hifiSpacemouse	avoid some more static/global QStrings in plugins	2016-11-13 11:29:19 -08:00
oculus	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
oculusLegacy	fixing the warning on macosx about the non portable file name	2017-05-31 23:59:44 -07:00
openvr	fixed wide stance issue	2017-06-22 22:48:32 +01: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