summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyBerta <richy@cyborgsociety.org>2013-12-21 00:45:04 +0100
committercyBerta <richy@cyborgsociety.org>2013-12-21 00:45:04 +0100
commit8387712a5488b3aadd308b67e7659b8f187d501b (patch)
tree8a26b11364f85ac78e4af1d350f2e1e7e5fa3e5d
parentb2efaf181fb7833206e97f64eb29400057a7d7ed (diff)
parent717b98a234e38acc862e75161dc5e16b185efc40 (diff)
Merge branch 'feature/move-the-settings-button-to-the-overflow-menu' into develop
-rw-r--r--res/menu/client_dashboard.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index 8f4a7ba8..806147eb 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -3,8 +3,6 @@
<item
android:id="@+id/menu_settings"
android:orderInCategory="100"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_menu_settings_holo_light"
android:title="@string/menu_settings"/>
<item
android:id="@+id/about_leap"
@@ -31,4 +29,4 @@
android:visible="false">
</item>
-</menu> \ No newline at end of file
+</menu>