02926a6e5f
Conflicts: AndroidManifest.xml res/values/arrays.xml res/values/strings.xml res/xml/preferences.xml src/de/danoeh/antennapod/activity/PreferenceActivity.java |
||
---|---|---|
.. | ||
gpodnet_searchable.xml | ||
miroguide_searchable.xml | ||
player_widget_info.xml | ||
preferences.xml | ||
searchable.xml |