projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright information.
[oweals/tinc.git]
/
COPYING.README
diff --git
a/COPYING.README
b/COPYING.README
index 26b4b1db4bca4e919de6b4a52f8af51dd19a636b..efeb98c0662e9b62f16864598b00b4f313ce7de9 100644
(file)
--- a/
COPYING.README
+++ b/
COPYING.README
@@
-7,8
+7,11
@@
of the GPL are met.
The following applies to the LZO library:
The following applies to the LZO library:
-Hereby I grant a special exception to the tinc VPN project
-(http://tinc.nl.linux.org/) to link the LZO library with the OpenSSL library
-(http://www.openssl.org).
+
Hereby I grant a special exception to the tinc VPN project
+
(http://tinc.nl.linux.org/) to link the LZO library with the OpenSSL library
+
(http://www.openssl.org).
-Markus F.X.J. Oberhumer
+ Markus F.X.J. Oberhumer
+
+When tinc is compiled with the --enable-tunemu option, the resulting binary
+falls under the GPL version 3 or later.