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/debug | |
| 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/debug')
| -rw-r--r-- | OpenKeychain/src/debug/res/mipmap-hdpi/ic_launcher.png (renamed from OpenKeychain/src/debug/res/drawable-hdpi/ic_launcher.png) | bin | 6863 -> 6863 bytes |
| -rw-r--r-- | OpenKeychain/src/debug/res/mipmap-mdpi/ic_launcher.png (renamed from OpenKeychain/src/debug/res/drawable-mdpi/ic_launcher.png) | bin | 4609 -> 4609 bytes |
| -rw-r--r-- | OpenKeychain/src/debug/res/mipmap-xhdpi/ic_launcher.png (renamed from OpenKeychain/src/debug/res/drawable-xhdpi/ic_launcher.png) | bin | 8887 -> 8887 bytes |
| -rw-r--r-- | OpenKeychain/src/debug/res/mipmap-xxhdpi/ic_launcher.png (renamed from OpenKeychain/src/debug/res/drawable-xxhdpi/ic_launcher.png) | bin | 13422 -> 13422 bytes |
| -rw-r--r-- | OpenKeychain/src/debug/res/mipmap-xxxhdpi/ic_launcher.png (renamed from OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_launcher.png) | bin | 16655 -> 16655 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/OpenKeychain/src/debug/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/debug/res/mipmap-hdpi/ic_launcher.png Binary files differindex bb5104aec..bb5104aec 100644 --- a/OpenKeychain/src/debug/res/drawable-hdpi/ic_launcher.png +++ b/OpenKeychain/src/debug/res/mipmap-hdpi/ic_launcher.png diff --git a/OpenKeychain/src/debug/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/debug/res/mipmap-mdpi/ic_launcher.png Binary files differindex e709f735d..e709f735d 100644 --- a/OpenKeychain/src/debug/res/drawable-mdpi/ic_launcher.png +++ b/OpenKeychain/src/debug/res/mipmap-mdpi/ic_launcher.png diff --git a/OpenKeychain/src/debug/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain/src/debug/res/mipmap-xhdpi/ic_launcher.png Binary files differindex fb4f2737a..fb4f2737a 100644 --- a/OpenKeychain/src/debug/res/drawable-xhdpi/ic_launcher.png +++ b/OpenKeychain/src/debug/res/mipmap-xhdpi/ic_launcher.png diff --git a/OpenKeychain/src/debug/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain/src/debug/res/mipmap-xxhdpi/ic_launcher.png Binary files differindex 37d0958ff..37d0958ff 100644 --- a/OpenKeychain/src/debug/res/drawable-xxhdpi/ic_launcher.png +++ b/OpenKeychain/src/debug/res/mipmap-xxhdpi/ic_launcher.png diff --git a/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_launcher.png b/OpenKeychain/src/debug/res/mipmap-xxxhdpi/ic_launcher.png Binary files differindex e5183fb05..e5183fb05 100644 --- a/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_launcher.png +++ b/OpenKeychain/src/debug/res/mipmap-xxxhdpi/ic_launcher.png |
