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/import_menu.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/import_menu.xml')
| -rw-r--r-- | res/menu/import_menu.xml | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/res/menu/import_menu.xml b/res/menu/import_menu.xml deleted file mode 100644 index c29db10e..00000000 --- a/res/menu/import_menu.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item
- android:id="@+id/ok"
- android:icon="@android:drawable/ic_menu_save"
- android:showAsAction="ifRoom|withText"
- android:title="@string/add_profile"
- android:titleCondensed="@string/import_vpn"/>
- <item
- android:id="@+id/cancel"
- android:icon="@android:drawable/ic_menu_close_clear_cancel"
- android:showAsAction="ifRoom|withText"
- android:title="@android:string/cancel"
- android:titleCondensed="@string/cancel"/>
-
-
-</menu>
\ No newline at end of file |