diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 11:56:57 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 11:56:57 -0600 |
| commit | bdedc7fa03c962f79d1f2ecdb8720ac29394a02e (patch) | |
| tree | 35994060c5b2a0a6109832757d04d231f69d0cf7 /res | |
| parent | 4bb6f30a63fb45ab5256b65c40a46979e8ece6ab (diff) | |
| parent | f6efff1a7ec06d68bad27cd65e66d33e72572c37 (diff) | |
Merge branch 'feature/configuration-wizard-menu' into develop
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/activity_configuration_wizard.xml | 9 | ||||
| -rw-r--r-- | res/menu/configuration_wizard_activity.xml | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/res/menu/activity_configuration_wizard.xml b/res/menu/activity_configuration_wizard.xml deleted file mode 100644 index 77f358b6..00000000 --- a/res/menu/activity_configuration_wizard.xml +++ /dev/null @@ -1,9 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > - - <item - android:id="@+id/menu_settings" - android:orderInCategory="100" - android:showAsAction="never" - android:title="@string/menu_settings"/> - -</menu>
\ No newline at end of file diff --git a/res/menu/configuration_wizard_activity.xml b/res/menu/configuration_wizard_activity.xml new file mode 100644 index 00000000..9e441a18 --- /dev/null +++ b/res/menu/configuration_wizard_activity.xml @@ -0,0 +1,8 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <item + android:id="@+id/about_leap" + android:orderInCategory="110" + android:title="@string/about"/> + +</menu>
\ No newline at end of file |