David Rowe 407ce745d5 Merge branch 'master' into M22075 ... # Conflicts: # libraries/controllers/src/controllers/Actions.cpp		2019-04-27 10:51:13 +12:00
..
hifiCodec	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
hifiKinect	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
hifiLeapMotion	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
hifiNeuron	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
hifiSdl2	Merge pull request #14645 from ctrlaltdavid/M19774-d	2019-01-16 09:09:38 -08:00
hifiSixense	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
hifiSpacemouse	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
oculus	Merge branch 'master' into M22075	2019-04-27 10:51:13 +12:00
oculusLegacy	Revert "Remove _compositeFramebuffer from display plugins"	2019-04-03 13:43:39 -07:00
openvr	Merge branch 'master' into M22075	2019-04-27 10:51:13 +12:00
pcmCodec	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
steamClient	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
CMakeLists.txt	migrating platform plugin	2019-01-16 17:05:50 -08:00