diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
| commit | 34a7728cec5c17ef25f3d5cd56421e4f5258862d (patch) | |
| tree | f8fcf0aced9b106facff2e50405a19288931da6b /Graphics/drawables/originals/gnupg-infographic/README | |
| parent | b73ad7d87e7ddef03c17b4983f526c0613403df6 (diff) | |
| parent | e049895b9f8f5f9996ac678acf6810768e859695 (diff) | |
| download | open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.gz open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.bz2 open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.zip | |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'Graphics/drawables/originals/gnupg-infographic/README')
| -rw-r--r-- | Graphics/drawables/originals/gnupg-infographic/README | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Graphics/drawables/originals/gnupg-infographic/README b/Graphics/drawables/originals/gnupg-infographic/README new file mode 100644 index 000000000..f29c0a84a --- /dev/null +++ b/Graphics/drawables/originals/gnupg-infographic/README @@ -0,0 +1,13 @@ +Source files for GnuPG infographic +================================== + +These are the source graphics for the Email Self-Defense infographic from the +Free Software Foundation, available at <http://EmailSelfDefense.fsf.org>. + +License +------- + +Copyright (c) 2014 Free Software Foundation, Inc. + +Licensed under the Creative Commons Attribution license (CC-BY). See full +source and attribution text at the above site. |