diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-21 15:11:59 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-21 15:11:59 +0200 |
commit | 2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a (patch) | |
tree | 7fe90c2f2004de54ecd6ce0706d6b2408149c26d /settings.gradle | |
parent | 976b232946a7777ce746c10d9a727a8722440df4 (diff) | |
parent | f560bc9317357a755b5862c1eec142b7c4665c0a (diff) | |
download | open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.tar.gz open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.tar.bz2 open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.zip |
Merge branch 'master' into yubikey
Diffstat (limited to 'settings.gradle')
-rw-r--r-- | settings.gradle | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/settings.gradle b/settings.gradle index d0b2b9954..e134c52a8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ include ':OpenKeychain' -include ':OpenKeychain-Test' include ':extern:openpgp-api-lib' include ':extern:openkeychain-api-lib' include ':extern:html-textview' @@ -14,4 +13,4 @@ include ':extern:AppMsg:library' include ':extern:SuperToasts:supertoasts' include ':extern:minidns' include ':extern:KeybaseLib:Lib' -include ':extern:openpgp-card-nfc-lib:library'
\ No newline at end of file +include ':extern:openpgp-card-nfc-lib:library' |