diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
| commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
| tree | 776bf4363c3e8736c3678eba93017387fffd8463 /README.md | |
| parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
| parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
| download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -132,6 +132,10 @@ When changing build files or dependencies, respect the following requirements: * https://www.timroes.de/2013/09/12/speed-up-gradle/ * Disable Lint checking if it is enabled in build.gradle +### Error:Configuration with name 'default' not found. + +Gradle project dependencies are missing. Do a ``git submodule init && git submodule update`` + ### Translations Translations are hosted on Transifex, which is configured by ".tx/config". @@ -216,10 +220,6 @@ Some parts and some libraries are Apache License v2, MIT X11 License (see below) * StickyListHeaders https://github.com/emilsjolander/StickyListHeaders Apache License v2 - -* Android-Bootstrap - https://github.com/Bearded-Hen/Android-Bootstrap - MIT License ### Images * icon.svg @@ -231,5 +231,8 @@ Some parts and some libraries are Apache License v2, MIT X11 License (see below) * QR Code Actionbar icon https://github.com/openintents/openintents/blob/master/extensions/qrcode_ext/icons/ic_menu_qr_code/ic_menu_qr_code_holo_light/ic_menu_qr_code.svg +* Key status icons by the ModernPGP working group + https://github.com/ModernPGP + * Purple color scheme http://android-holo-colors.com/ |