diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2014-02-04 18:07:16 -0800 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2014-02-04 18:07:16 -0800 |
| commit | c49e87b8fd272fabc3f674fa8103b455c3bb5304 (patch) | |
| tree | d79c3f152c8a3fba149430b886b36905f4949cce /res/menu/logmenu.xml | |
| parent | dbf1265f736c00aa31289e75818b1ec56311d31c (diff) | |
| parent | 53be6c97314d2a0c96be8b7c9a3c7e5ae493c901 (diff) | |
Merge branch 'feature/remove-legacy-ics-openvpn-classes-that-wont-be-used' into develop
Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop
Diffstat (limited to 'res/menu/logmenu.xml')
| -rw-r--r-- | res/menu/logmenu.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml index bb810df0..c4087585 100644 --- a/res/menu/logmenu.xml +++ b/res/menu/logmenu.xml @@ -26,10 +26,9 @@ android:title="@string/send_logfile"
android:titleCondensed="@string/send"/>
<item
- android:id="@+id/edit_vpn"
android:alphabeticShortcut="e"
android:icon="@android:drawable/ic_menu_edit"
android:showAsAction="withText|ifRoom"
android:title="@string/edit_vpn"/>
-</menu>
\ No newline at end of file +</menu>
|