diff options
| author |  Szymon Tomasz Stefanek | 2008-08-26 19:51:18 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2008-08-26 19:51:18 +0000 |
| commit | 6dc798b58b9381f096c86632ee728daafb6fcd96 (patch) | |
| tree | a5608a8ed1b3992f7846da561e7796e1562b6ee6 | |
| parent | upportd patch from r2307 (diff) | |
| download | KVIrc-6dc798b58b9381f096c86632ee728daafb6fcd96.tar.gz KVIrc-6dc798b58b9381f096c86632ee728daafb6fcd96.tar.bz2 KVIrc-6dc798b58b9381f096c86632ee728daafb6fcd96.zip | |
Fix the OpenSSL licensing issue. Thnx to Kebianizao for taking care of composing the additional license paragraph.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2309 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | doc/COPYING | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/doc/COPYING b/doc/COPYING index 39b31577c..b2ef8e72e 100644 --- a/doc/COPYING +++ b/doc/COPYING @@ -1,7 +1,7 @@ This is the KVIrc Irc Client license. It is based on the GNU General Public License Version 2. -It contains all the GPL terms and conditions and adds a special exception -(see Terms and Conditions , clause 13) to the distribution limitations. +It contains all the GPL terms and conditions and adds two special exceptions +(see Terms and Conditions , clauses 13 and 14) to the distribution limitations. Note that the GPL below is copyrighted by the Free Software Foundation, but the instance of code that it refers to is copyrighted by @@ -300,3 +300,12 @@ non-commercial edition in the source distribution. The Qt non-commercial edition library is covered by the Qt Non-Commercial license. See http://www.trolltech.com for informations. + 14. As a special exception, Szymon Stefanek gives permission to link this +program with the OpenSSL project's "OpenSSL" library (or with modified +versions of it that use the same license as the "OpenSSL" library), and +distribute the linked executables. You must obey the GNU General Public +License in all respects for all of the code used other than "OpenSSL". +If you modify file(s), you may extend this exception to your version +of the file(s), but you are not obligated to do so. If you do not wish to do +so, delete this exception statement from your version. + |