Kalila L 6e7e7f5c55 Correct applying of shortcut names.		2020-10-03 03:58:32 -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 sandbox and console names on PR builds.	2020-10-02 20:52:03 -04:00
modules
ports	Merge branch 'master' into feature/eye-tracking-option	2020-07-11 08:14:13 +12:00
templates	Correct applying of shortcut names.	2020-10-03 03:58:32 -04:00
compiler.cmake
init.cmake	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00