mirror of
https://github.com/ZeroTier/ZeroTierOne
synced 2025-08-20 21:33:57 -07:00
Merge branch 'dev' into hello-encryption
This commit is contained in:
commit
e366661a09
21 changed files with 778 additions and 476 deletions
|
@ -30,7 +30,8 @@ CORE_OBJS=\
|
|||
node/Trace.o \
|
||||
node/Utils.o \
|
||||
node/Bond.o \
|
||||
node/PacketMultiplexer.o
|
||||
node/PacketMultiplexer.o \
|
||||
osdep/OSUtils.o
|
||||
|
||||
ONE_OBJS=\
|
||||
controller/EmbeddedNetworkController.o \
|
||||
|
@ -42,7 +43,6 @@ ONE_OBJS=\
|
|||
osdep/EthernetTap.o \
|
||||
osdep/ManagedRoute.o \
|
||||
osdep/Http.o \
|
||||
osdep/OSUtils.o \
|
||||
service/SoftwareUpdater.o \
|
||||
service/OneService.o
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue