Howard Stearns 3088a84035 Just bringing the code up to date and forcing a build to see how Jenkins/osx is doing. ... Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving		2016-05-20 08:04:38 -07:00
..
hifiNeuron	Fix for vive controllers sometimes not working	2016-05-10 19:32:08 -07:00
hifiSdl2	Restore SDL2 comments	2016-03-28 12:25:56 -07:00
hifiSixense	Fix for vive controllers sometimes not working	2016-05-10 19:32:08 -07:00
oculus	Fix test for specific Oculus version	2016-04-19 18:13:12 -07:00
oculusLegacy	Moving GL backend out of GPU	2016-05-16 12:54:17 -07:00
openvr	OpenVRDispalyPlugin: fix one-frame lag in resetSensors.	2016-05-19 13:56:40 -07:00
CMakeLists.txt	Support for runtime plugins (DLLs)	2015-11-01 11:12:12 -08:00