David Rowe 0f324ee9ae Merge branch 'v2020.2.2-rc' into feature/openvr-linux ... # Conflicts: # plugins/openvr/CMakeLists.txt # plugins/openvr/src/ViveControllerManager.cpp		2020-06-19 16:27:53 +12:00
..
externals	Fix files not removed in master merge	2020-04-11 15:40:11 +12:00
installer	Merge remote-tracking branch 'refs/remotes/kasen/master'	2020-06-10 02:49:13 +02:00
macros	Update packaging parameters for Vircadia.	2020-06-01 22:48:38 -04:00
modules	remove old/unused eyetracker code	2019-09-17 09:43:32 -07:00
ports	Merge branch 'v2020.2.2-rc' into feature/openvr-linux	2020-06-19 16:27:53 +12:00
templates	Update packaging parameters for Vircadia.	2020-06-01 22:48:38 -04:00
compiler.cmake	Allow a user to limit the number of cores used when building	2019-08-26 11:51:42 -07:00
init.cmake	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00