diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 14:39:28 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-02 14:39:28 +0100 |
| commit | 2f83291920e024b0f8038fe0caa747051b41cf1c (patch) | |
| tree | 780fc0975e56b3dbd8a1eb4cb2988ac3e2e23ea1 /Resources/new icon/ready-launcher-icons | |
| parent | aa22a0defcf94d5f734d3a00288f5c8d916d2e57 (diff) | |
| parent | 4e29d027af05fc574dc5398d2fb3afcdf3defc70 (diff) | |
| download | open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.tar.gz open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.tar.bz2 open-keychain-2f83291920e024b0f8038fe0caa747051b41cf1c.zip | |
NON-WORKING Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
extern/spongycastle
Diffstat (limited to 'Resources/new icon/ready-launcher-icons')
18 files changed, 0 insertions, 0 deletions
diff --git a/Resources/new icon/ready-launcher-icons/144/vector-src-blue.png b/Resources/new icon/ready-launcher-icons/144/vector-src-blue.png Binary files differdeleted file mode 100644 index 37d0958ff..000000000 --- a/Resources/new icon/ready-launcher-icons/144/vector-src-blue.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/144/vector-src-purple.png b/Resources/new icon/ready-launcher-icons/144/vector-src-purple.png Binary files differdeleted file mode 100644 index f9c611990..000000000 --- a/Resources/new icon/ready-launcher-icons/144/vector-src-purple.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/144/vector-src.png b/Resources/new icon/ready-launcher-icons/144/vector-src.png Binary files differdeleted file mode 100644 index 4809acc39..000000000 --- a/Resources/new icon/ready-launcher-icons/144/vector-src.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/192/vector-src-blue.png b/Resources/new icon/ready-launcher-icons/192/vector-src-blue.png Binary files differdeleted file mode 100644 index e5183fb05..000000000 --- a/Resources/new icon/ready-launcher-icons/192/vector-src-blue.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/192/vector-src-purple.png b/Resources/new icon/ready-launcher-icons/192/vector-src-purple.png Binary files differdeleted file mode 100644 index a730b4320..000000000 --- a/Resources/new icon/ready-launcher-icons/192/vector-src-purple.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/192/vector-src.png b/Resources/new icon/ready-launcher-icons/192/vector-src.png Binary files differdeleted file mode 100644 index fab324e93..000000000 --- a/Resources/new icon/ready-launcher-icons/192/vector-src.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/48/vector-src-blue.png b/Resources/new icon/ready-launcher-icons/48/vector-src-blue.png Binary files differdeleted file mode 100644 index e709f735d..000000000 --- a/Resources/new icon/ready-launcher-icons/48/vector-src-blue.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/48/vector-src-purple.png b/Resources/new icon/ready-launcher-icons/48/vector-src-purple.png Binary files differdeleted file mode 100644 index b8789fcd9..000000000 --- a/Resources/new icon/ready-launcher-icons/48/vector-src-purple.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/48/vector-src.png b/Resources/new icon/ready-launcher-icons/48/vector-src.png Binary files differdeleted file mode 100644 index d945a01de..000000000 --- a/Resources/new icon/ready-launcher-icons/48/vector-src.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/512/vector-src-blue.png b/Resources/new icon/ready-launcher-icons/512/vector-src-blue.png Binary files differdeleted file mode 100644 index c4ffab9b6..000000000 --- a/Resources/new icon/ready-launcher-icons/512/vector-src-blue.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/512/vector-src-purple.png b/Resources/new icon/ready-launcher-icons/512/vector-src-purple.png Binary files differdeleted file mode 100644 index 3dd98f5ed..000000000 --- a/Resources/new icon/ready-launcher-icons/512/vector-src-purple.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/512/vector-src.png b/Resources/new icon/ready-launcher-icons/512/vector-src.png Binary files differdeleted file mode 100644 index c3416bef3..000000000 --- a/Resources/new icon/ready-launcher-icons/512/vector-src.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/72/vector-src-blue.png b/Resources/new icon/ready-launcher-icons/72/vector-src-blue.png Binary files differdeleted file mode 100644 index bb5104aec..000000000 --- a/Resources/new icon/ready-launcher-icons/72/vector-src-blue.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/72/vector-src-purple.png b/Resources/new icon/ready-launcher-icons/72/vector-src-purple.png Binary files differdeleted file mode 100644 index 8acde1dd3..000000000 --- a/Resources/new icon/ready-launcher-icons/72/vector-src-purple.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/72/vector-src.png b/Resources/new icon/ready-launcher-icons/72/vector-src.png Binary files differdeleted file mode 100644 index 6133816d2..000000000 --- a/Resources/new icon/ready-launcher-icons/72/vector-src.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/96/vector-src-blue.png b/Resources/new icon/ready-launcher-icons/96/vector-src-blue.png Binary files differdeleted file mode 100644 index fb4f2737a..000000000 --- a/Resources/new icon/ready-launcher-icons/96/vector-src-blue.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/96/vector-src-purple.png b/Resources/new icon/ready-launcher-icons/96/vector-src-purple.png Binary files differdeleted file mode 100644 index 7d455a4cb..000000000 --- a/Resources/new icon/ready-launcher-icons/96/vector-src-purple.png +++ /dev/null diff --git a/Resources/new icon/ready-launcher-icons/96/vector-src.png b/Resources/new icon/ready-launcher-icons/96/vector-src.png Binary files differdeleted file mode 100644 index 825b18b38..000000000 --- a/Resources/new icon/ready-launcher-icons/96/vector-src.png +++ /dev/null |
