overte-JulianGro/interface
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
i18n
icon
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
CMakeLists.txt Formatting cleanup 2021-06-20 14:22:28 +02:00
interface.entitlements
interface.exe.manifest