Merge tag 'v3.2.1' into linked-identities

Browse Source

Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml

...

This commit is contained in:

Vincent Breitmoser

2015-05-11 17:28:34 +02:00

parent 92ac2ded10 5c44f84009

commit 20a6c5ce8a

104 changed files with 1597 additions and 1339 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

Graphics/drawables/function.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 95 KiB After Width:  |  Height:  |  Size: 63 KiB

680

Graphics/drawables/function.svg

File diff suppressed because one or more lines are too long

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 197 KiB After Width:  |  Height:  |  Size: 128 KiB

BIN

Graphics/screenshots/device-2015-05-06-140816.png Normal file

Binary file not shown.

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

BIN

Graphics/screenshots/device-2015-05-06-141500.png Normal file

Binary file not shown.

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

BIN

Graphics/screenshots/device-2015-05-06-141508.png Normal file

Binary file not shown.

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

BIN

Graphics/screenshots/device-2015-05-06-141517.png Normal file

Binary file not shown.

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

BIN

Graphics/screenshots/device-2015-05-06-141527.png Normal file

Binary file not shown.

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

BIN

Graphics/screenshots/device-2015-05-06-141552.png Normal file

Binary file not shown.

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

BIN

Graphics/screenshots/device-2015-05-06-142026.png Normal file

Binary file not shown.

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