diff --git a/AUTHORS b/AUTHORS index 21107440e..cd070caba 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,19 +17,23 @@ Contributors: * Nick Tiskov Code from other projects: -* files src/qtsingleapplication/* src/lineedit/* +* files src/app/qtlocalpeer/* copyright: Nokia Corporation - license: LGPL + license: mixed -* files src/ico.cpp src/ico.h - copyright: Malte Starostik - license: LGPL +* files src/gui/lineedit.* + copyright: Trolltech ASA + license: custom * files src/search_engine/socks.py copyright: Dan Haim license: BSD -* file src/stacktrace_win.h +* file src/app/stacktrace.h + copyright: Timo Bingmann from http://idlebox.net/ + license: WTFPL v2.0 + +* file src/app/stacktrace_win.h copyright: Quassel Project license: GPLv2/3 diff --git a/COPYING b/COPYING index 3a486c265..0afd58567 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,6 @@ -qBittorrent is licensed under the GNU General Public License version 2 with the -addition of the following special exception: +qBittorrent is licensed under the GNU General Public License either version 2, +or (at your option) any later version with the addition of the following +special exception: In addition, as a special exception, the copyright holders give permission to link this program with the OpenSSL project's "OpenSSL" library (or with @@ -10,6 +11,8 @@ 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. +See also the AUTHORS file + ---------- GNU GENERAL PUBLIC LICENSE diff --git a/src/gui/gpl.html b/src/gui/gpl.html index 4c9c80da2..6ad30e852 100644 --- a/src/gui/gpl.html +++ b/src/gui/gpl.html @@ -5,8 +5,8 @@ License -

qBittorrent is licensed under the GNU General Public License version 2 with the -addition of the following special exception:

+

qBittorrent is licensed under the GNU General Public License either version 2, +or (at your option) any later version with the addition of the following special exception:

In addition, as a special exception, the copyright holders give permission to link this program with the OpenSSL project's "OpenSSL" library (or with diff --git a/src/webui/www/private/views/about.html b/src/webui/www/private/views/about.html index fa9cea9a0..92042cb22 100644 --- a/src/webui/www/private/views/about.html +++ b/src/webui/www/private/views/about.html @@ -130,8 +130,8 @@