diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-24 15:01:41 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-24 15:01:41 +0000 |
| commit | 59f31dd97ddc3f3f918a432ea4e20552c3006d97 (patch) | |
| tree | 7477656e08f6aaff1849d25cd593cd0510bc7d1f /res/menu/stop_menu.xml | |
| parent | 46143c64dbdcbbfb478b2df4949c617682427d63 (diff) | |
| parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
| download | southamptonuniversitymap-59f31dd97ddc3f3f918a432ea4e20552c3006d97.tar southamptonuniversitymap-59f31dd97ddc3f3f918a432ea4e20552c3006d97.tar.gz | |
Merge branch 'dev' into dev-rdf
Conflicts:
src/net/cbaines/suma/BuildingActivity.java
Diffstat (limited to 'res/menu/stop_menu.xml')
| -rw-r--r-- | res/menu/stop_menu.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/menu/stop_menu.xml b/res/menu/stop_menu.xml index 408e536..c44efa2 100644 --- a/res/menu/stop_menu.xml +++ b/res/menu/stop_menu.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" > - <!--<item + <item android:id="@+id/menu_previous_stop" android:icon="@drawable/ic_menu_back" - android:title="@string/menu_previous_stop"/>--> + android:title="@string/menu_previous_stop"/> <item android:id="@+id/menu_refresh_stop" android:icon="@drawable/ic_menu_refresh" android:title="@string/menu_refresh_stop"/> - <!--<item + <item android:id="@+id/menu_next_stop" android:icon="@drawable/ic_menu_forward" - android:title="@string/menu_next_stop"/>--> + android:title="@string/menu_next_stop"/> </menu>
\ No newline at end of file |