Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development

Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
This commit is contained in:
Dominik Schürmann
2015-03-04 20:54:11 +01:00
8 changed files with 225 additions and 2 deletions

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_log_display_export_log"
android:icon="@drawable/ic_action_save_white"
android:title="@string/menu_export_log"
app:showAsAction="ifRoom|withText" />
</menu>