aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-01-09 12:31:45 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-01-09 12:31:45 +0100
commit11ed8d7e16abfb98cd96d8a4447382c83435dac8 (patch)
tree0db8e5a572caf65f0a19da9f26240ccbd993d288 /OpenPGP-Keychain
parent14a8738933bd2bb323ee05a47421881337f6e9d7 (diff)
downloadopen-keychain-11ed8d7e16abfb98cd96d8a4447382c83435dac8.tar.gz
open-keychain-11ed8d7e16abfb98cd96d8a4447382c83435dac8.tar.bz2
open-keychain-11ed8d7e16abfb98cd96d8a4447382c83435dac8.zip
add AndroidBootstrap lib
Diffstat (limited to 'OpenPGP-Keychain')
-rw-r--r--OpenPGP-Keychain/build.gradle1
-rw-r--r--OpenPGP-Keychain/project.properties1
-rw-r--r--OpenPGP-Keychain/res/raw/help_about.html6
3 files changed, 7 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
index afc95fee8..143005caa 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -25,6 +25,7 @@ dependencies {
compile project(':libraries:HtmlTextView')
compile project(':libraries:StickyListHeaders:library')
compile project(':libraries:zxing')
+ compile project(':libraries:AndroidBootstrap')
}
android {
diff --git a/OpenPGP-Keychain/project.properties b/OpenPGP-Keychain/project.properties
index 73fc44378..76caac668 100644
--- a/OpenPGP-Keychain/project.properties
+++ b/OpenPGP-Keychain/project.properties
@@ -13,3 +13,4 @@ android.library.reference.1=../libraries/ActionBarSherlock
android.library.reference.2=../libraries/HtmlTextView
android.library.reference.3=../libraries/StickyListHeaders/library
android.library.reference.4=../libraries/zxing
+android.library.reference.5=../libraries/AndroidBootstrap
diff --git a/OpenPGP-Keychain/res/raw/help_about.html b/OpenPGP-Keychain/res/raw/help_about.html
index 0ed0d3b05..8b412ded0 100644
--- a/OpenPGP-Keychain/res/raw/help_about.html
+++ b/OpenPGP-Keychain/res/raw/help_about.html
@@ -14,6 +14,8 @@ And don't add newlines before or after p tags because of transifex -->
<li>Dominik Schürmann (Lead developer)</li>
<li>Ash Hughes</li>
<li>Brian C. Barnes</li>
+<li>Bahtiar 'kalkin' Gadimov</li>
+
</ul>
<h2>Developers APG 1.x</h2>
<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>