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/originals/qrcode/drawable-mdpi | |
| 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/originals/qrcode/drawable-mdpi')
12 files changed, 0 insertions, 0 deletions
diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png Binary files differnew file mode 100644 index 000000000..b9dfb309c --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png Binary files differnew file mode 100644 index 000000000..f2e6ad3e7 --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png Binary files differnew file mode 100644 index 000000000..75231c4c4 --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png Binary files differnew file mode 100644 index 000000000..593aa8f2a --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..7ecef0044 --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..af36e585c --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..956eb886c --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png Binary files differnew file mode 100644 index 000000000..347b0378a --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png Binary files differnew file mode 100644 index 000000000..be2f80974 --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png Binary files differnew file mode 100644 index 000000000..5cf552b13 --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png Binary files differnew file mode 100644 index 000000000..261f4a5ab --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png diff --git a/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png Binary files differnew file mode 100644 index 000000000..a2c6ade61 --- /dev/null +++ b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png |
