Merge branch 'master' into yubikey

2014-07-21 15:11:59 +02:00
parent 976b232946 f560bc9317
commit 2f5c73746d
17 changed files with 319 additions and 145 deletions
--- 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'
+include ':extern:openpgp-card-nfc-lib:library'