diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
| commit | 7b3bc4ca98c2be52bec996287c5997c3c52e3603 (patch) | |
| tree | 861f5c7d329ea8c96e673b2c16f068d593a55fb9 /README.md | |
| parent | 98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a (diff) | |
| parent | 8c8fdd6c495bb12f5c76c9d1fc4a6a44f1c3808b (diff) | |
| download | open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.gz open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.bz2 open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 28 |
1 files changed, 1 insertions, 27 deletions
@@ -214,33 +214,7 @@ Some parts and some libraries are Apache License v2, MIT X11 License (see below) ### Libraries -* SpongyCastle - https://github.com/rtyley/spongycastle - MIT X11 License - -* Android Support Library v4 - http://developer.android.com/tools/support-library/index.html - Apache License v2 - -* Android Support Library v7 'appcompat' - http://developer.android.com/tools/support-library/index.html - Apache License v2 - -* HtmlTextView - https://github.com/dschuermann/html-textview - Apache License v2 - -* ZXing - https://github.com/zxing/zxing - Apache License v2 - -* StickyListHeaders - https://github.com/emilsjolander/StickyListHeaders - Apache License v2 - -* https://github.com/jpardogo/PagerSlidingTabStrip - -* https://github.com/journeyapps/zxing-android-embedded +See https://github.com/open-keychain/open-keychain/blob/development/OpenKeychain/src/main/res/raw/help_about.html ### Images * icon.svg |