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-hdpi | |
| 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-hdpi')
18 files changed, 0 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/account_key.png b/OpenKeychain/src/main/res/drawable-hdpi/account_key.png Binary files differnew file mode 100644 index 000000000..b6a99772e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/account_key.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png Binary files differnew file mode 100644 index 000000000..c3445cb8d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_extension_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_extension_black_24dp.png Binary files differnew file mode 100644 index 000000000..e711e87e2 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_extension_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..b6e040adb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png Binary files differdeleted file mode 100644 index 6133816d2..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png Binary files differnew file mode 100644 index 000000000..d8b42bbe4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_ethernet_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_ethernet_black_24dp.png Binary files differnew file mode 100644 index 000000000..c97350f3f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_ethernet_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor.png Binary files differnew file mode 100644 index 000000000..b6e040adb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor_off.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor_off.png Binary files differnew file mode 100644 index 000000000..e72d7ca4b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_tor_off.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_sync_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_sync_black_24dp.png Binary files differnew file mode 100644 index 000000000..a5ebdbd07 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_sync_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png Binary files differnew file mode 100644 index 000000000..17482011b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png Binary files differnew file mode 100644 index 000000000..41719efd6 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png Binary files differnew file mode 100644 index 000000000..2a1ae67d7 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png Binary files differnew file mode 100644 index 000000000..278fac4f8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png Binary files differnew file mode 100644 index 000000000..dd0fce197 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/octo_link_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/octo_link_24dp.png Binary files differnew file mode 100644 index 000000000..dc1b2bc4d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/octo_link_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png Binary files differnew file mode 100644 index 000000000..e9dfc47a4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png Binary files differnew file mode 100644 index 000000000..4a3f2b2b5 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png |
