Kalila L aa20fbb0d9 Fix double application of "Vircadia"		2020-10-02 16:48:54 -04: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	Fix double application of "Vircadia"	2020-10-02 16:48:54 -04:00
modules	remove old/unused eyetracker code	2019-09-17 09:43:32 -07:00
ports	Merge branch 'master' into feature/eye-tracking-option	2020-07-11 08:14:13 +12:00
templates	Merge branch 'master' into feature/update-shortcut-names	2020-10-02 15:24:18 -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