David Rowe 71cee734ec Merge branch 'master' into fix/interface-console ... # Conflicts: # README.md		2020-12-18 19:44:20 +13:00
..
externals
installer	Update OSX folder icons to Vircadia.	2020-08-25 03:25:00 -04:00
macros	Merge branch 'master' into fix/interface-console	2020-12-18 19:44:20 +13:00
modules
ports	Merge pull request #917 from JulianGro/gles	2020-12-17 20:23:26 -05:00
templates	Merge branch 'master' into fix/interface-console	2020-11-11 20:31:33 +13:00
compiler.cmake
init.cmake