Kalila 89d1346644 Merge pull request #919 from ArcadeFever/fix/upgrade-android-oculus-sdk-23.0.0.1-and-1.37.0 ... Upgraded Oculus Mobile and Platform SDKs to latest (1.37.0 and 23.0.0)		2020-12-17 20:24:37 -05:00
..
externals	Fix files not removed in master merge	2020-04-11 15:40:11 +12:00
installer	Update OSX folder icons to Vircadia.	2020-08-25 03:25:00 -04:00
macros	Upgraded Oculus SDKs to latest	2020-12-15 00:04:59 -08:00
modules	remove old/unused eyetracker code	2019-09-17 09:43:32 -07:00
ports	Merge pull request #917 from JulianGro/gles	2020-12-17 20:23:26 -05:00
templates	Merge branch 'master' into gha-master-ci	2020-10-29 17:32:53 -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