diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-05 12:10:51 +0100 |
commit | 7b3bc4ca98c2be52bec996287c5997c3c52e3603 (patch) | |
tree | 861f5c7d329ea8c96e673b2c16f068d593a55fb9 /OpenKeychain/src/main/res/menu/key_view.xml | |
parent | 98ce06dbc9bea56d2960df2d7b8e7a5bc9e9e43a (diff) | |
parent | 8c8fdd6c495bb12f5c76c9d1fc4a6a44f1c3808b (diff) | |
download | open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.gz open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.tar.bz2 open-keychain-7b3bc4ca98c2be52bec996287c5997c3c52e3603.zip |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/menu/key_view.xml')
-rw-r--r-- | OpenKeychain/src/main/res/menu/key_view.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index 37a926e7c..3d1b02958 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -22,7 +22,7 @@ <item android:id="@+id/menu_key_view_delete" - android:icon="@drawable/ic_action_discard" + android:icon="@drawable/ic_delete_grey_24dp" app:showAsAction="never" android:title="@string/menu_delete_key" /> |