Mercurial > trustbridge
changeset 1239:5839d864239c
Merged.
| author | Emanuel Schuetze <emanuel@intevation.de> |
|---|---|
| date | Wed, 24 Sep 2014 15:52:32 +0200 |
| parents | 4a329513ee86 (current diff) 6154d554b3af (diff) |
| children | 17aa7cf0bedd |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/packaging/linux-installer.inc Wed Sep 24 15:52:08 2014 +0200 +++ b/packaging/linux-installer.inc Wed Sep 24 15:52:32 2014 +0200 @@ -43,7 +43,10 @@ # # This file is Free Software under the GNU GPL (v>=2) # and comes with ABSOLUTELY NO WARRANTY! -# See LICENSE.txt for details. +# For details and the license of TrustBridge +# see the folder "licenses" after installation +# check the corresponding revision of it online at +# https://wald.intevation.org/hg/trustbridge/file/tip/licenses set -u
--- a/ui/aboutdialog.cpp Wed Sep 24 15:52:08 2014 +0200 +++ b/ui/aboutdialog.cpp Wed Sep 24 15:52:32 2014 +0200 @@ -61,7 +61,9 @@ "<li>OpenSSL-based signcode utility (GNU GPL v==3)" + "<li>OpenSSL (OpenSSL License)" + "<li>NSIS (zlib/libpng license & Common Public License version 1.0)</ul>" + - tr("You will find the legally binding details in the 'licenses' directory of the " + tr("You will find the legally binding details in the 'licenses' directory " + "where TrustBridge is installed " + "or in the corresponding revision of the" "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>.")); textDesc->setTextFormat(Qt::RichText);