open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
..
compatibility
helper Magic to find possible mails and names of device owner 2014-06-28 00:05:12 +02:00
keyimport Move sks-keyservers.net CA into assets folder 2014-06-25 00:37:01 +02:00
pgp modifyKey: proper expiry check during SubkeyAdd 2014-07-11 15:42:02 +02:00
provider some UncachedKeyRing fixes, primary user id mostly 2014-07-11 02:50:35 +02:00
remote Fix nullpointer in API, fix #693 2014-07-08 04:24:27 +02:00
service Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00
ui Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00
util Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Constants.java Move sks-keyservers.net CA into assets folder 2014-06-25 00:37:01 +02:00
KeychainApplication.java Move sks-keyservers.net CA into assets folder 2014-06-25 00:37:01 +02:00