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/nfc/drawable-xhdpi | |
| 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/nfc/drawable-xhdpi')
12 files changed, 0 insertions, 0 deletions
diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_18dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_18dp.png Binary files differnew file mode 100644 index 000000000..684c2cb81 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_18dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_24dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_24dp.png Binary files differnew file mode 100644 index 000000000..c987c1249 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_24dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_36dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_36dp.png Binary files differnew file mode 100644 index 000000000..5789581cc --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_36dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_48dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_48dp.png Binary files differnew file mode 100644 index 000000000..aabd4c0b6 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_black_48dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_18dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..fedf39013 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_18dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_24dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..04e0bf781 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_24dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_36dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..7e8fa6ba2 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_36dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_48dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_48dp.png Binary files differnew file mode 100644 index 000000000..ee00975dc --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_grey600_48dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_18dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_18dp.png Binary files differnew file mode 100644 index 000000000..1d87415c5 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_18dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_24dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_24dp.png Binary files differnew file mode 100644 index 000000000..44b9006ab --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_24dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_36dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_36dp.png Binary files differnew file mode 100644 index 000000000..484856b3f --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_36dp.png diff --git a/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_48dp.png b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_48dp.png Binary files differnew file mode 100644 index 000000000..c8f25bbf7 --- /dev/null +++ b/Graphics/drawables/originals/nfc/drawable-xhdpi/ic_nfc_white_48dp.png |
