diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2017-04-17 17:19:49 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2017-04-17 17:19:49 -0700 |
| commit | 8a7d214e7d7d5b47832f44de3e232e03ec7f10d3 (patch) | |
| tree | 3e0790cc6d3c36287be13f4bc939c80aa8246b0e /app/src/main/res/menu | |
| parent | 544d65124e3e3a85694238da4639749f7c9f34ef (diff) | |
| parent | 594e5ac1a5b86f495c60857e45c5eca16229faac (diff) | |
| download | dsub-8a7d214e7d7d5b47832f44de3e232e03ec7f10d3.tar.gz dsub-8a7d214e7d7d5b47832f44de3e232e03ec7f10d3.tar.bz2 dsub-8a7d214e7d7d5b47832f44de3e232e03ec7f10d3.zip | |
Merge branch 'enhanced-playback-speed' of https://github.com/SilentViking/Subsonic into SilentViking-enhanced-playback-speed
# Conflicts:
# app/src/main/java/github/daneren2005/dsub/util/Constants.java
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/playback_speed_options.xml | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/app/src/main/res/menu/playback_speed_options.xml b/app/src/main/res/menu/playback_speed_options.xml deleted file mode 100644 index 909d3b3c..00000000 --- a/app/src/main/res/menu/playback_speed_options.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/playback_speed_half" - android:title="@string/download.playback_speed_half"/> - - <item - android:id="@+id/playback_speed_normal" - android:title="@string/download.playback_speed_normal"/> - - <item - android:id="@+id/playback_speed_one_half" - android:title="@string/download.playback_speed_one_half"/> - - <item - android:id="@+id/playback_speed_double" - android:title="@string/download.playback_speed_double"/> - - <item - android:id="@+id/playback_speed_tripple" - android:title="@string/download.playback_speed_tripple"/> - - <item - android:id="@+id/playback_speed_custom" - android:title="@string/download.playback_speed_custom"/> -</menu>
\ No newline at end of file |