David Rowe 74c2788a14 Merge branch 'master' into dev/rename-hifisockaddr-webapp ... # Conflicts: # assignment-client/src/AssignmentClient.cpp # domain-server/src/DomainServer.cpp # libraries/networking/src/DomainHandler.cpp # libraries/networking/src/LimitedNodeList.cpp # libraries/networking/src/LimitedNodeList.h # libraries/networking/src/SockAddr.cpp # libraries/networking/src/SockAddr.h # libraries/networking/src/udt/Socket.cpp # libraries/networking/src/udt/Socket.h # tools/ice-client/src/ICEClientApp.cpp		2021-07-21 15:03:29 +12:00
..
compiledResources
external	remove old/unused eyetracker code	2019-09-17 09:43:32 -07:00
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/rename-hifisockaddr-webapp	2021-07-21 15:03:29 +12:00
ui	Specified color on text edit for console	2019-10-29 15:46:16 -07:00
CMakeLists.txt	Formatting cleanup	2021-06-20 14:22:28 +02:00
interface.entitlements	Add entitlements for Launcher and Interface	2019-09-06 11:20:16 -07:00
interface.exe.manifest