diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
| commit | 20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f (patch) | |
| tree | 258667acf6ea0c995b47195492d453c7459b31ca /Graphics/screenshots | |
| parent | 92ac2ded10548756922a4c22ebae0a19b8862426 (diff) | |
| parent | 5c44f8400970de5943fd6c5e804dfa394f3deb01 (diff) | |
| download | open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.gz open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.bz2 open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.zip | |
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
Diffstat (limited to 'Graphics/screenshots')
| -rw-r--r-- | Graphics/screenshots/device-2015-05-06-140816.png | bin | 0 -> 125976 bytes |
| -rw-r--r-- | Graphics/screenshots/device-2015-05-06-141500.png | bin | 0 -> 71827 bytes |
| -rw-r--r-- | Graphics/screenshots/device-2015-05-06-141508.png | bin | 0 -> 117383 bytes |
| -rw-r--r-- | Graphics/screenshots/device-2015-05-06-141517.png | bin | 0 -> 192906 bytes |
| -rw-r--r-- | Graphics/screenshots/device-2015-05-06-141527.png | bin | 0 -> 64936 bytes |
| -rw-r--r-- | Graphics/screenshots/device-2015-05-06-141552.png | bin | 0 -> 65007 bytes |
| -rw-r--r-- | Graphics/screenshots/device-2015-05-06-142026.png | bin | 0 -> 296680 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/Graphics/screenshots/device-2015-05-06-140816.png b/Graphics/screenshots/device-2015-05-06-140816.png Binary files differnew file mode 100644 index 000000000..705287dd8 --- /dev/null +++ b/Graphics/screenshots/device-2015-05-06-140816.png diff --git a/Graphics/screenshots/device-2015-05-06-141500.png b/Graphics/screenshots/device-2015-05-06-141500.png Binary files differnew file mode 100644 index 000000000..930e61c64 --- /dev/null +++ b/Graphics/screenshots/device-2015-05-06-141500.png diff --git a/Graphics/screenshots/device-2015-05-06-141508.png b/Graphics/screenshots/device-2015-05-06-141508.png Binary files differnew file mode 100644 index 000000000..e00002fb3 --- /dev/null +++ b/Graphics/screenshots/device-2015-05-06-141508.png diff --git a/Graphics/screenshots/device-2015-05-06-141517.png b/Graphics/screenshots/device-2015-05-06-141517.png Binary files differnew file mode 100644 index 000000000..786c6e977 --- /dev/null +++ b/Graphics/screenshots/device-2015-05-06-141517.png diff --git a/Graphics/screenshots/device-2015-05-06-141527.png b/Graphics/screenshots/device-2015-05-06-141527.png Binary files differnew file mode 100644 index 000000000..103fc8186 --- /dev/null +++ b/Graphics/screenshots/device-2015-05-06-141527.png diff --git a/Graphics/screenshots/device-2015-05-06-141552.png b/Graphics/screenshots/device-2015-05-06-141552.png Binary files differnew file mode 100644 index 000000000..b4bd1ccd0 --- /dev/null +++ b/Graphics/screenshots/device-2015-05-06-141552.png diff --git a/Graphics/screenshots/device-2015-05-06-142026.png b/Graphics/screenshots/device-2015-05-06-142026.png Binary files differnew file mode 100644 index 000000000..9b36c9ba4 --- /dev/null +++ b/Graphics/screenshots/device-2015-05-06-142026.png |
