open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Dominik Schürmann 881a50207a Merge branch 'master' into yubikey
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
2014-08-06 01:08:12 +02:00
..
exception new-edit: add new save keyring stuff 2014-06-17 20:11:54 +02:00
CanonicalizedKeyRing.java Add license headers 2014-08-04 16:46:23 +02:00
CanonicalizedPublicKey.java Add license headers 2014-08-04 16:46:23 +02:00
CanonicalizedPublicKeyRing.java Add license headers 2014-08-04 16:46:23 +02:00
CanonicalizedSecretKey.java Merge branch 'master' into yubikey 2014-08-06 01:08:12 +02:00
CanonicalizedSecretKeyRing.java Merge branch 'master' into yubikey 2014-08-06 01:08:12 +02:00
KeyRing.java Add license headers 2014-08-04 16:46:23 +02:00
NullProgressable.java Add license headers 2014-08-04 16:46:23 +02:00
OpenPgpSignatureResultBuilder.java remove obsolete subkey binding check from signature verification 2014-06-19 00:14:28 +02:00
PgpDecryptVerify.java rename Wrapped*Key* to Canonicalized*Key* 2014-07-31 17:09:30 +02:00
PgpDecryptVerifyResult.java
PgpHelper.java Final Commit for #662 2014-07-16 18:17:46 +02:00
PgpImportExport.java rename Wrapped*Key* to Canonicalized*Key* 2014-07-31 17:09:30 +02:00
PgpKeyHelper.java Merge branch 'master' into yubikey 2014-08-06 01:08:12 +02:00
PgpKeyOperation.java Edit key: key flags 2014-08-05 22:35:37 +02:00
PgpSignEncrypt.java Merge branch 'master' into yubikey 2014-08-06 01:08:12 +02:00
Progressable.java Rename ProgressDialogUpdater to Progressable 2014-04-29 18:44:44 +02:00
UncachedKeyRing.java Optimize imports 2014-08-05 22:46:00 +02:00
UncachedPublicKey.java Add license headers 2014-08-04 16:46:23 +02:00
UncachedSecretKey.java Add license headers 2014-08-04 16:46:23 +02:00
WrappedSignature.java Add license headers 2014-08-04 16:46:23 +02:00