diff options
author | Thomas Knepper <thknepper@gmx.de> | 2014-04-09 11:22:42 +0200 |
---|---|---|
committer | Thomas Knepper <thknepper@gmx.de> | 2014-04-09 11:22:42 +0200 |
commit | e7d54c69a86d443ad9eac085ef3a55428d7bec43 (patch) | |
tree | be4795e7760029df5b16a7dc8b6a596ef9ce8830 /res/menu | |
parent | 1f8ad0577fcab7cd6a4b43b6935ec4f3d5dbf884 (diff) | |
parent | 5b2c0aa9c2de27653537a37b1d29dd12acfc853f (diff) | |
download | dsub-e7d54c69a86d443ad9eac085ef3a55428d7bec43.tar.gz dsub-e7d54c69a86d443ad9eac085ef3a55428d7bec43.tar.bz2 dsub-e7d54c69a86d443ad9eac085ef3a55428d7bec43.zip |
Merge branch 'master' of git://github.com/daneren2005/Subsonic
Diffstat (limited to 'res/menu')
-rw-r--r-- | res/menu/downloading.xml (renamed from res/menu/nowplaying_downloading.xml) | 4 | ||||
-rw-r--r-- | res/menu/nowplaying.xml | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/res/menu/nowplaying_downloading.xml b/res/menu/downloading.xml index 50ab00f3..670a2803 100644 --- a/res/menu/nowplaying_downloading.xml +++ b/res/menu/downloading.xml @@ -7,10 +7,6 @@ android:title="@string/download.menu_remove_all" compat:showAsAction="always|withText"/> - <item - android:id="@+id/menu_toggle_now_playing" - android:title="@string/download.show_now_playing"/> - <item android:id="@+id/menu_exit" android:title="@string/menu.exit"/> diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml index 1d720464..bc87f0c4 100644 --- a/res/menu/nowplaying.xml +++ b/res/menu/nowplaying.xml @@ -36,10 +36,6 @@ <item android:id="@+id/menu_toggle_timer" android:title="@string/download.start_timer"/> - - <item - android:id="@+id/menu_toggle_now_playing" - android:title="@string/download.show_downloading"/> <item android:id="@+id/menu_exit" |