Merge branch 'master' into improve-file-more

Browse Source

Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java

...

This commit is contained in:

mar-v-in

2014-07-31 23:19:01 +02:00

parent 0c7eea225b 50aea621ba

commit eae7c711a3

439 changed files with 8241 additions and 3217 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/key_certify_error.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_depth0.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_self.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 940 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/key_certify_revoke.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 911 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1008 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 911 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 736 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 676 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 906 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 706 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 784 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1017 B