diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-14 16:02:28 +0200 |
| commit | 2f95100d88954db389cba8e615390795d121c1c8 (patch) | |
| tree | 1bf4ffb29bb83fac33ba2ed7c84fb1d6a8af2bd4 /OpenKeychain/build.gradle | |
| parent | 90ac60b6db0637fbefbce5cb2cd80a64f5bb708d (diff) | |
| parent | 638554f2560b3c5fd36ca9b4ba205cb5a999b84b (diff) | |
| download | open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.gz open-keychain-2f95100d88954db389cba8e615390795d121c1c8.tar.bz2 open-keychain-2f95100d88954db389cba8e615390795d121c1c8.zip | |
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/build.gradle')
| -rw-r--r-- | OpenKeychain/build.gradle | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 393a18d08..090a7a2bf 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -10,8 +10,8 @@ sourceSets { dependencies { compile 'com.android.support:support-v4:19.1.0' compile 'com.android.support:appcompat-v7:19.1.0' - compile project(':OpenKeychain-API:libraries:openpgp-api-library') - compile project(':OpenKeychain-API:libraries:openkeychain-api-library') + compile project(':extern:openpgp-api-lib') + compile project(':extern:openkeychain-api-lib') compile project(':extern:html-textview') compile project(':extern:StickyListHeaders:library') compile project(':extern:AndroidBootstrap:AndroidBootstrap') @@ -29,8 +29,8 @@ dependencies { testLocalCompile 'com.google.android:android:4.1.1.4' testLocalCompile 'com.android.support:support-v4:19.1.0' testLocalCompile 'com.android.support:appcompat-v7:19.1.0' - testLocalCompile project(':OpenKeychain-API:libraries:openpgp-api-library') - testLocalCompile project(':OpenKeychain-API:libraries:openkeychain-api-library') + testLocalCompile project(':extern:openpgp-api-lib') + testLocalCompile project(':extern:openkeychain-api-lib') testLocalCompile project(':extern:html-textview') testLocalCompile project(':extern:StickyListHeaders:library') testLocalCompile project(':extern:AndroidBootstrap:AndroidBootstrap') |