David Rowe c45007d038 Merge branch 'master' into fix/can-rez-attachment ... # Conflicts: # interface/src/Application.h		2021-03-29 15:28:08 +13:00
..
compiledResources
external
i18n
icon	Update interface and server-console icons.	2020-06-07 20:43:38 -04:00
resources	Merge branch 'master' into fix/can-rez-attachment	2021-03-29 15:28:08 +13:00
src	Merge branch 'master' into fix/can-rez-attachment	2021-03-29 15:28:08 +13:00
ui
CMakeLists.txt	Set OpenGL_GL_PREFERENCE to LEGACY	2020-10-13 20:13:45 +02:00
interface.entitlements
interface.exe.manifest