diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-06-26 21:18:13 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-06-26 21:18:13 +0200 |
| commit | d70bdb426cb675fc32a9784936377618f5abbdd3 (patch) | |
| tree | 763260d5541418f00c5b799ada0f24ba76e57fdf /doc/LICENSE.txt | |
| parent | 36f61c0ef54ea6b348db627ea8733fcfcd685429 (diff) | |
Update License
Diffstat (limited to 'doc/LICENSE.txt')
| -rw-r--r-- | doc/LICENSE.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/LICENSE.txt b/doc/LICENSE.txt index 7836430f..0cfdc19d 100644 --- a/doc/LICENSE.txt +++ b/doc/LICENSE.txt @@ -7,8 +7,8 @@ If you need a non GPLv2 license of the source please contact me. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; version 2 -of the License only. +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,3 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +In addition, as a special exception, the copyright holders give +permission to link the code of portions of this program with the +OpenSSL library. + |