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 /Graphics/drawables/material-launcher/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 'Graphics/drawables/material-launcher/ready-launcher-icons')
18 files changed, 0 insertions, 0 deletions
diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-blue.png Binary files differnew file mode 100644 index 000000000..37d0958ff --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-blue.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-purple.png Binary files differnew file mode 100644 index 000000000..f9c611990 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-purple.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src.png Binary files differnew file mode 100644 index 000000000..4809acc39 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-blue.png Binary files differnew file mode 100644 index 000000000..e5183fb05 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-blue.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-purple.png Binary files differnew file mode 100644 index 000000000..a730b4320 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-purple.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src.png Binary files differnew file mode 100644 index 000000000..fab324e93 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-blue.png Binary files differnew file mode 100644 index 000000000..e709f735d --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-blue.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-purple.png Binary files differnew file mode 100644 index 000000000..b8789fcd9 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-purple.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src.png Binary files differnew file mode 100644 index 000000000..d945a01de --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-blue.png Binary files differnew file mode 100644 index 000000000..c4ffab9b6 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-blue.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-purple.png Binary files differnew file mode 100644 index 000000000..3dd98f5ed --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-purple.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src.png Binary files differnew file mode 100644 index 000000000..c3416bef3 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-blue.png Binary files differnew file mode 100644 index 000000000..bb5104aec --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-blue.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-purple.png Binary files differnew file mode 100644 index 000000000..8acde1dd3 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-purple.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src.png Binary files differnew file mode 100644 index 000000000..6133816d2 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-blue.png Binary files differnew file mode 100644 index 000000000..fb4f2737a --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-blue.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-purple.png Binary files differnew file mode 100644 index 000000000..7d455a4cb --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-purple.png diff --git a/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src.png Binary files differnew file mode 100644 index 000000000..825b18b38 --- /dev/null +++ b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src.png |