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 /OpenKeychain/build.gradle | |
| 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 'OpenKeychain/build.gradle')
| -rw-r--r-- | OpenKeychain/build.gradle | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 265411595..32ae8ceb0 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'android' +apply plugin: 'com.android.application' dependencies { // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information @@ -18,6 +18,7 @@ dependencies { compile project(':extern:SuperToasts:supertoasts') compile project(':extern:minidns') compile project(':extern:KeybaseLib:Lib') + compile project(':extern:TokenAutoComplete:library') compile project(':extern:openpgp-card-nfc-lib:library') } |