open-keychain/extern
Dominik Schürmann e8780b4410 Merge branch 'development' into detached-sigs-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
..
KeybaseLib@2b26d163df Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
StickyListHeaders@62cc58c12d Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
SuperToasts@77042d633f Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
TokenAutoComplete@ca46b4261c Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
android-lockpattern@b9fcb13dca Add android-lockpattern library 2014-12-29 23:10:50 +01:00
html-textview@eedaa334e7 Update buildTools to 19.1 2014-06-09 21:55:32 +02:00
minidns@f3a19080f1 Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
openkeychain-api-lib@88c0047932 Update plugin to 1.0 2014-12-12 14:31:41 +01:00
openpgp-api-lib@edcc61970f Merge branch 'development' into detached-sigs-api 2015-01-27 09:46:42 +01:00
safeslinger-exchange@96f7c89356 Update safeslinger lib 2015-01-12 15:38:16 +01:00
spongycastle@26c232f31b work on divert-to-key and other keyring stuff 2015-01-25 01:57:58 +01:00
zxing-android-integration@e2d0064bd3 Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
zxing-qr-code@8fd0657d33 Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00