David Rowe f69e0402aa Merge branch 'master' into feature/qt-update-master ... # Conflicts: # BUILD.md # BUILD_WIN.md		2021-02-23 16:08:55 +13:00
..
externals	Fix files not removed in master merge	2020-04-11 15:40:11 +12:00
installer	Update installer images.	2021-02-01 18:07:55 -05:00
macros	Merge branch 'master' into feature/qt-update-master	2021-02-23 16:08:55 +13:00
modules	remove old/unused eyetracker code	2019-09-17 09:43:32 -07:00
ports	Merge branch 'master' into feature/qt-update-master	2021-02-23 16:08:55 +13:00
templates	Update BuildInfo.h.in	2021-01-23 19:20:19 -05: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