David Rowe 1a745094e2 Merge branch 'master' into 21055 ... Conflicts: libraries/entities-renderer/src/RenderableWebEntityItem.cpp libraries/gl/src/gl/OffscreenQmlSurface.h		2016-10-06 09:29:09 +13:00
..
hifiCodec	Checkpoint	2016-07-15 12:04:45 -06:00
hifiNeuron	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-21 16:39:25 -07:00
hifiSdl2	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-21 16:39:25 -07:00
hifiSixense	initial changes needed for android interface cmake	2016-08-31 10:53:29 -07:00
hifiSpacemouse	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-22 08:55:22 -07:00
oculus	only activate a touch device if one is connected	2016-09-23 14:30:34 -07:00
oculusLegacy	Fix mac build (again?)	2016-10-02 17:42:10 -07:00
openvr	Merge branch 'master' into 21055	2016-10-06 09:29:09 +13:00
pcmCodec	more hacking	2016-07-14 08:20:07 -07:00
CMakeLists.txt	don't target any plugins for android	2016-08-31 11:19:01 -07:00