David Rowe c03312319d Merge branch 'master' into dev/webapp-master-update ... # Conflicts: # libraries/networking/src/NodeList.h # libraries/shared/src/shared/WebRTC.h		2021-10-03 12:51:47 +13:00
..
compiledResources
external
i18n
icon	Update interface and server-console icons.	2020-06-07 20:43:38 -04:00
resources	Update copyright headers.	2021-06-21 12:06:52 -04:00
src	Merge branch 'master' into dev/webapp-master-update	2021-10-03 12:51:47 +13:00
ui	Specified color on text edit for console	2019-10-29 15:46:16 -07:00
CMakeLists.txt	Set GL preference to GLVND	2021-09-17 21:04:12 +02:00
interface.entitlements
interface.exe.manifest