diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
commit | 3814ae7d53a22ba89f1e39d7a4661016f76cf8c8 (patch) | |
tree | d83d41d3c424a784da144515665fb41ef650aa52 /OpenKeychain/src/main/res/drawable-mdpi | |
parent | dbaf7070ead596f5c70ad48fc55aada2f77a856a (diff) | |
parent | d5dd6a49c8156a699b3fbbbeef06658e1c232c16 (diff) | |
download | open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.gz open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.bz2 open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.zip |
Merge branch 'master' into mime4j
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/drawable-mdpi')
18 files changed, 0 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/account_key.png b/OpenKeychain/src/main/res/drawable-mdpi/account_key.png Binary files differnew file mode 100644 index 000000000..d5e22f248 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/account_key.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_black_24dp.png Binary files differnew file mode 100644 index 000000000..633105072 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_extension_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_extension_black_24dp.png Binary files differnew file mode 100644 index 000000000..075d6ca15 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_extension_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..49b475fcb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png Binary files differdeleted file mode 100644 index d945a01de..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_black_24dp.png Binary files differnew file mode 100644 index 000000000..c00a24ebf --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_ethernet_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_ethernet_black_24dp.png Binary files differnew file mode 100644 index 000000000..a9efbf176 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_ethernet_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..49b475fcb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor_off.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor_off.png Binary files differnew file mode 100644 index 000000000..9d6447799 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_tor_off.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_sync_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_sync_black_24dp.png Binary files differnew file mode 100644 index 000000000..9685e8e16 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_sync_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png Binary files differnew file mode 100644 index 000000000..df43ca5f4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png Binary files differnew file mode 100644 index 000000000..c6f3e9a06 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png Binary files differnew file mode 100644 index 000000000..ba3d2e4b7 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png Binary files differnew file mode 100644 index 000000000..54b085aaf --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png Binary files differnew file mode 100644 index 000000000..86ca9d46e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/octo_link_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/octo_link_24dp.png Binary files differnew file mode 100644 index 000000000..5e0542f39 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/octo_link_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png Binary files differnew file mode 100644 index 000000000..28e37d9f3 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png Binary files differnew file mode 100644 index 000000000..cc7091df0 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png |