diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-12 15:50:09 -0800 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-12 15:50:09 -0800 |
| commit | 92aa5b36bba57e4927f146d49c9f124a37b7b5f9 (patch) | |
| tree | 865d3962e54225fc4f13e0d19852ddc061e7e05f /OpenPGP-Keychain/res/raw | |
| parent | 536c4db48f12287eaf1875e2d208c0ad07e31ee6 (diff) | |
| parent | e3bcf64d9e63e293c51db921572a9b87533d26ad (diff) | |
| download | open-keychain-92aa5b36bba57e4927f146d49c9f124a37b7b5f9.tar.gz open-keychain-92aa5b36bba57e4927f146d49c9f124a37b7b5f9.tar.bz2 open-keychain-92aa5b36bba57e4927f146d49c9f124a37b7b5f9.zip | |
Merge pull request #179 from dschuermann/key-details
Key details
Diffstat (limited to 'OpenPGP-Keychain/res/raw')
| -rw-r--r-- | OpenPGP-Keychain/res/raw/help_about.html | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/res/raw/help_about.html b/OpenPGP-Keychain/res/raw/help_about.html index 0ed0d3b05..54af42b16 100644 --- a/OpenPGP-Keychain/res/raw/help_about.html +++ b/OpenPGP-Keychain/res/raw/help_about.html @@ -12,13 +12,15 @@ And don't add newlines before or after p tags because of transifex --> <h2>Developers OpenPGP Keychain</h2> <ul> <li>Dominik Schürmann (Lead developer)</li> -<li>Ash Hughes</li> +<li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> + </ul> <h2>Developers APG 1.x</h2> <ul> -<li>Thialfihar (Lead developer)</li> -<li>Senecaso (QRCode, sign key, upload key)</li> +<li>'Thialfihar' (Lead developer)</li> +<li>'Senecaso' (QRCode, sign key, upload key)</li> <li>Oliver Runge</li> <li>Markus Doits</li> </ul> @@ -26,7 +28,9 @@ And don't add newlines before or after p tags because of transifex --> <h2>Libraries</h2> <ul> <li><a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> -<li><a href="http://code.google.com/p/zxing/">ZXing QRCode Integration</a> (Apache License v2)</li> +<li><a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> +<li><a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li> +<li><a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> <li><a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> <li><a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> <li>Icons from <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)</li> |