David Rowe 32b7823a73 Merge remote-tracking branch 'upstream/fix/URL-migrations' into fix/external-resource ... # Conflicts: # libraries/networking/src/ExternalResource.h		2020-09-23 23:25:42 +12:00
..
compiledResources
external
i18n
icon	Update interface and server-console icons.	2020-06-07 20:43:38 -04:00
resources	Fix another URL.	2020-09-23 03:56:50 -04:00
src	Tidying	2020-09-23 23:08:02 +12:00
ui	Specified color on text edit for console	2019-10-29 15:46:16 -07:00
CMakeLists.txt	Change strings, comments and folders to Vircadia	2020-07-09 16:03:07 +02:00
interface.entitlements
interface.exe.manifest