Vincent Breitmoser 20a6c5ce8a Version 3.2.1 ...

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVTz9/AAoJEHGMBwEAASKCRxoH/0IqEXg79Hu2Q+XHzfxNl01W
 ork+6qHRG6AaKaYv5xEgj2CFwG/HSpVGbTR+3ahn28d9UMgh05vSRR2Jh2qkSMCb
 owEVMlHopQkWKqLEsXcbkdMQxDqdVTUeLJcldxR2+B7CM1orZr6VLSU6rDVvHLq1
 kPBAsk74cNg8svjfRFC4GdveWGNOnhUY267kVi7TFOhOIhX2ujbfY1ovJK7Zt5Ft
 qCg2/TY2tWDZUkJ3RIhwrBVUo6lvMNZ5r0cjkualBOe3qNZqejXt6IwEjZZR9vLA
 YkICjSF6DaLpTR97WucMKN2zqe4Gv4jWhYP4q+2OqrbJSUwbqxAsTahlyQXxht4=
 =YRwH
 -----END PGP SIGNATURE-----

Merge tag 'v3.2.1' into linked-identities

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

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

..

material-launcher

Graphic stuff

2015-04-17 17:30:03 +02:00

originals

Tryout design for encrypt, decrypt

2015-03-06 01:52:06 +01:00

All_Icons.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

comment-text.svg

First work on new key view toolbar

2015-02-25 02:35:09 +01:00

create_key_robot.svg

Fix first time wizard design

2015-02-03 19:13:02 +01:00

drawer_header2.svg

Floating action button icons and methods for key list

2015-02-21 20:46:37 +01:00

drawer_header.svg

Once again: Colors and header image

2015-02-22 21:16:40 +01:00

first_time_1.svg

Fix first time wizard design

2015-02-03 19:13:02 +01:00

function.png

Update function graphic

2015-05-06 14:03:52 +02:00

function.svg

Add screenshots

2015-05-06 14:22:53 +02:00

glyph_authlite.png

Graphic stuff

2015-04-17 17:30:03 +02:00

ic_action_encrypt_copy.svg

Improve icons

2015-03-09 13:27:24 +01:00

ic_action_encrypt_file.svg

First work on new key view toolbar

2015-02-25 02:35:09 +01:00

ic_action_encrypt_save.svg

Improve icons

2015-03-09 13:27:24 +01:00

ic_action_encrypt_share.svg

Improve icons

2015-03-09 13:27:24 +01:00

ic_action_encrypt_text.svg

First work on new key view toolbar

2015-02-25 02:35:09 +01:00

ic_action_safeslinger.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

ic_action_search_cloud.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

ic_action_verified_cutout.svg

First work on new key view toolbar

2015-02-25 02:35:09 +01:00

ic_cloud_search.svg

Partially fix file names

2015-03-04 19:04:15 +01:00

ic_launcher_old.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

icon_sizes.txt

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

key_flag_authenticate.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

key_flag_certify.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

key_flag_encrypt.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

key_flag_sign.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

linked_dns.svg

more linked id ui fine tuning

2015-03-26 16:30:49 +01:00

linked_github.svg

more linked id ui fine tuning

2015-03-26 16:30:49 +01:00

linked_https.svg

more linked id ui fine tuning

2015-03-26 16:30:49 +01:00

linked_twitter.svg

more linked id ui fine tuning

2015-03-26 16:30:49 +01:00

status_lock_closed.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_lock_error.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_lock_open.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_expired_cutout.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_expired.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_invalid_cutout.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_invalid.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_revoked_cutout.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_revoked.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_unknown_cutout.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_unknown.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_unverified_cutout.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_unverified.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_verified_cutout.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

status_signature_verified_inner.svg

work on certification ui

2015-03-15 22:10:05 +01:00

status_signature_verified.svg

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

yubi_icon.svg

split up wait/action yubikey fragments

2015-03-21 22:18:58 +01:00