diff options
| author | James Falcon <therealfalcon@gmail.com> | 2013-05-06 21:48:18 -0500 |
|---|---|---|
| committer | James Falcon <therealfalcon@gmail.com> | 2013-05-06 21:48:18 -0500 |
| commit | b48c3807fd23df0a6d953ebdabaaf2330bc4f3d3 (patch) | |
| tree | 327374119c2b40b64de192534b8b6e4f242778be /res/xml | |
| parent | 5b58466fd21c8bc97fe00698369228ea96566c33 (diff) | |
| parent | 2db89cb807ae06b0f59039307e20c32cd9052b57 (diff) | |
| download | AntennaPod-b48c3807fd23df0a6d953ebdabaaf2330bc4f3d3.zip | |
Merge branch 'playback-speed' into speed
Conflicts:
res/values/arrays.xml
res/values/strings.xml
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/service/PlaybackService.java
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/preferences.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 39c9fba64..cf3219681 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -26,7 +26,7 @@ <PreferenceCategory android:title="@string/network_pref" > <ListPreference android:defaultValue="0" - android:entries="@array/update_intervall_options" + android:entries="@array/update_intervall_values" android:entryValues="@array/update_intervall_values" android:key="prefAutoUpdateIntervall" android:summary="@string/pref_autoUpdateIntervall_sum" |