github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge dev

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-30 15:40:00 -07:00
commit 5435ec7545
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
6 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
one.cpp
View file

@ -82,12 +82,8 @@ using namespace ZeroTier;
static OneService *volatile zt1Service = (OneService *)0;
#define PROGRAM_NAME "ZeroTier One"
#define COPYRIGHT_NOTICE "Copyright (c) 2011-2018 ZeroTier, Inc."
#define LICENSE_GRANT \
"This is free software: you may copy, modify, and/or distribute this" ZT_EOL_S \
"work under the terms of the GNU General Public License, version 3 or" ZT_EOL_S \
"later as published by the Free Software Foundation." ZT_EOL_S \
"No warranty expressed or implied." ZT_EOL_S
#define COPYRIGHT_NOTICE "Copyright (c) 2019 ZeroTier, Inc."
#define LICENSE_GRANT "Licensed under the ZeroTier BSL 1.1 (see LICENSE.txt)"
/****************************************************************************/
/* zerotier-cli personality */