diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
commit | a4b7daf266b037c6a39cef0586aadedf32861ad5 (patch) | |
tree | 8446f6aae86530a8546caa99af6f9bac4f095370 /OpenKeychain/src/main/res/menu | |
parent | d27925ad19b6800658a69670ceaed261776ba6d3 (diff) | |
parent | dcaac4f85f07efff2fdfd8a2eec9ba8ee758659c (diff) | |
download | open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.gz open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.bz2 open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.zip |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/menu')
-rw-r--r-- | OpenKeychain/src/main/res/menu/key_list.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index 15e098138..c4797d5f7 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -20,6 +20,11 @@ app:showAsAction="never" /> <item + android:id="@+id/menu_key_list_update_all_keys" + android:title="@string/menu_update_all_keys" + app:showAsAction="never" /> + + <item android:id="@+id/menu_key_list_debug_cons" android:title="Debug / Consolidate" android:visible="false" |