diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-06 01:08:12 +0200 |
| commit | 881a50207af0a9f9f5aa69f451110de786779b54 (patch) | |
| tree | 776bf4363c3e8736c3678eba93017387fffd8463 /OpenKeychain/src/main/res/drawable-xxhdpi | |
| parent | 0bfac9989f801aa93d8bc336307d60b817995688 (diff) | |
| parent | 6ba7536838b8fbc69684bec7c3e847afcb5e9d6a (diff) | |
| download | open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.gz open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.tar.bz2 open-keychain-881a50207af0a9f9f5aa69f451110de786779b54.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
Diffstat (limited to 'OpenKeychain/src/main/res/drawable-xxhdpi')
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/attachment_bg_holo.9.png | bin | 0 -> 1316 bytes |
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png | bin | 760 -> 0 bytes |
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_good.png | bin | 823 -> 0 bytes |
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_important_small.png | bin | 890 -> 0 bytes |
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png | bin | 0 -> 585 bytes |
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png | bin | 0 -> 3607 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/attachment_bg_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/attachment_bg_holo.9.png Binary files differnew file mode 100644 index 000000000..13855a2b1 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/attachment_bg_holo.9.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png Binary files differdeleted file mode 100644 index f97084dbe..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_good.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_good.png Binary files differdeleted file mode 100644 index fda51ad86..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_good.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_important_small.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_important_small.png Binary files differdeleted file mode 100644 index 44754152f..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_important_small.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png Binary files differnew file mode 100644 index 000000000..c09886632 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png Binary files differnew file mode 100644 index 000000000..130c670c9 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_generic_man.png |
