aboutsummaryrefslogtreecommitdiffstats
path: root/release/README
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-03-05 23:24:49 +0100
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-03-05 23:24:49 +0100
commita6636e6d7bf43f4a5cfc23521a322bb15a4c67a5 (patch)
treece5dcfff506d8031cb4c86a78e0afed3f0b63011 /release/README
parentshow password dialog in middle of app window (diff)
downloadgpg4usb-a6636e6d7bf43f4a5cfc23521a322bb15a4c67a5.tar.gz
gpg4usb-a6636e6d7bf43f4a5cfc23521a322bb15a4c67a5.zip
added credits for key image and changed COPYING to GPL3
git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2@846 34ebc366-c3a9-4b3c-9f84-69acf7962910
Diffstat (limited to 'release/README')
-rw-r--r--release/README6
1 files changed, 5 insertions, 1 deletions
diff --git a/release/README b/release/README
index ba5b274..7b14c80 100644
--- a/release/README
+++ b/release/README
@@ -33,7 +33,7 @@ Our homepage is located at http://gpg4usb.cpunk.de .
LICENSES
--------
-gpg4usblib itself is licensed under the GPL (see COPYING).
+gpg4usb itself is licensed under the GPLv3 (see COPYING).
There are some libries and the gpg-binary included in the zip-file / a static
gpg-build which (may) have different licenses, for more information check
@@ -43,3 +43,7 @@ GPG: http://gnupg.org/
QT: http://trolltech.no/ , http://trolltech.no/downloads/opensource
Iconset used is Nuvola (http://icon-king.com/?p=15), which has a LGPL License
+
+The key image in the wizard (keys12.jpg) is a croped version of
+http://www.flickr.com/photos/laureenp/6141822934/, which is licensed cc by-nc-sa.
+Our derived work is also cc by-nc-sa