diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-18 07:57:12 +0200 |
| commit | 5fcce648e200669f1ae0875c7aea9dc3a4a37574 (patch) | |
| tree | f3741fdf0c8fcb6e6728fa49d61af7ea6c7f1aaa /main/res/menu/static_maps_activity_options.xml | |
| parent | 6b2972bfd1fdc14cd84f78e3674e97b46675345d (diff) | |
| parent | 786eccacbb285696d504d08ba02c61400ce063a2 (diff) | |
| download | cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.zip cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.gz cgeo-5fcce648e200669f1ae0875c7aea9dc3a4a37574.tar.bz2 | |
Merge remote-tracking branch 'schwabe/actionbar_pullrequest'
Conflicts:
main/res/values/preference_keys.xml
main/src/cgeo/geocaching/CgeoApplication.java
Diffstat (limited to 'main/res/menu/static_maps_activity_options.xml')
| -rw-r--r-- | main/res/menu/static_maps_activity_options.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/res/menu/static_maps_activity_options.xml b/main/res/menu/static_maps_activity_options.xml index 7850c92..8621153 100644 --- a/main/res/menu/static_maps_activity_options.xml +++ b/main/res/menu/static_maps_activity_options.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_refresh" android:icon="@drawable/ic_menu_refresh" + cgeo:showAsAction="ifRoom" android:title="@string/cache_offline_refresh"> </item> |