diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-24 13:19:43 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-24 13:19:43 +0100 |
commit | 040cf42cb07c0bc58aceb048804c6d9359754499 (patch) | |
tree | 8534be929516f9a2d5a489b8fd9e14d247f1a392 /OpenKeychain/src/main/res/raw-it/help_about.html | |
parent | c694d73cab1edf91cb94d53cc8352ca93f0eb6ce (diff) | |
parent | eeccd7cd1475f02a9f4650f1debc38ab6a66d866 (diff) | |
download | open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.tar.gz open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.tar.bz2 open-keychain-040cf42cb07c0bc58aceb048804c6d9359754499.zip |
Merge branch 'development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/raw-it/help_about.html')
-rw-r--r-- | OpenKeychain/src/main/res/raw-it/help_about.html | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/OpenKeychain/src/main/res/raw-it/help_about.html b/OpenKeychain/src/main/res/raw-it/help_about.html deleted file mode 100644 index 0f24b7918..000000000 --- a/OpenKeychain/src/main/res/raw-it/help_about.html +++ /dev/null @@ -1,61 +0,0 @@ -<html> -<head></head> -<body> -<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p> -<p><a href="http://www.openkeychain.org">OpenKeychain</a> un implementazione OpenPGP per Android.</p> -<p>Licenza: GPLv3+</p> - -<h2>Sviluppatori</h2> -<ul> -<li>Dominik Schürmann (Manutentore)</li> -<li>Art O Cathain</li> -<li>Ash Hughes</li> -<li>Brian C. Barnes</li> -<li>Bahtiar 'kalkin' Gadimov</li> -<li>Daniel Albert</li> -<li>Daniel Hammann</li> -<li>Daniel Haß</li> -<li>Greg Witczak</li> -<li>'mar-v-in'</li> -<li>Markus Doits</li> -<li>Miroojin Bakshi</li> -<li>Nikhil Peter Raj</li> -<li>Paul Sarbinowski</li> -<li>'Senecaso'</li> -<li>Signe Rüsch</li> -<li>Sreeram Boyapati</li> -<li>Thialfihar (APG 1.x)</li> -<li>Tim Bray</li> -<li>Vincent Breitmoser</li> -</ul> -<h2>Librerie</h2> -<ul> -<li> -<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (Licenza MIT X11)</li> -<li> -<a href="https://github.com/SafeSlingerProject/exchange-android">Libreria SafeSlinger Exchange</a> (Licenza MIT)</li> -<li> -<a href="http://developer.android.com/tools/support-library/index.html">Android Support Libraries</a> (Apache License v2)</li> -<li> -<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Licenza Apache v2)</li> -<li> -<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Licenza Apache v2)</li> -<li> -<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Licenza Apache v2)</li> -<li> -<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licenza Apache v2)</li> -<li> -<a href="https://github.com/zxing/zxing">ZXing</a> (Apache License v2)</li> -<li> -<a href="https://github.com/journeyapps/zxing-android-embedded">ZXing Android Minimal</a> (Apache License v2)</li> -<li> -<a href="https://github.com/jpardogo/PagerSlidingTabStrip">PagerSlidingTabStrip (Material Design)</a> (Apache License v2)</li> -<li> -<a href="https://github.com/neokree/MaterialNavigationDrawer">MaterialNavigationDrawer</a> (Apache License v2)</li> -<li> -<a href="https://github.com/nispok/snackbar">Snackbar</a> (MIT License)</li> -<li> -<a href="https://github.com/futuresimple/android-floating-action-button">FloatingActionButton</a> (Apache License v2)</li> -</ul> -</body> -</html> |