David Rowe c3b7d65617 Merge branch 'master' into feature/qt-update-master ... # Conflicts: # BUILD.md		2021-03-25 10:18:38 +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-03-25 10:18:38 +13:00
modules
ports	Merge branch 'master' into feature/qt-update-master	2021-02-23 16:08:55 +13:00
templates	Merge pull request #1081 from digisomni/feature/pkg-updates	2021-03-14 17:35:03 -04:00
compiler.cmake
init.cmake