From d70bdb426cb675fc32a9784936377618f5abbdd3 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 26 Jun 2013 21:18:13 +0200 Subject: Update License --- doc/LICENSE.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'doc') 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. + -- cgit v1.2.3