daniel oeh e58922fad0 Merge branch 'feed_preferences' into develop ... Conflicts: res/values/strings.xml src/de/danoeh/antennapod/storage/DBTasks.java src/de/danoeh/antennapod/storage/PodDBAdapter.java		2013-10-08 23:43:13 +02:00
..
about.xml
addfeed.xml
audioplayer_activity.xml
authentication_dialog.xml
cover_fragment.xml
default_feeditemlist_item.xml
directory_chooser.xml
downloadlist_item.xml
downloadlog_item.xml
episodes_fragment.xml
external_itemlist_item.xml
external_player_fragment.xml
feedinfo.xml
feeditemlist_activity.xml
feeditemlist_header.xml
feeditemlist_item.xml
feeditemlist.xml
feeditemview.xml
feedlist_item_grid.xml
feedlist_item.xml
feedlist.xml
flattr_auth.xml
gpodnet_main.xml
gpodnet_podcast_list.xml
gpodnet_podcast_listitem.xml
gpodnet_search.xml
gpodnet_tag_activity.xml
gpodnetauth_activity.xml
gpodnetauth_credentials.xml
gpodnetauth_device.xml
gpodnetauth_finish.xml
itemdescription_listitem.xml
listview_activity.xml
loading_footer.xml
main.xml
miroguide_category.xml
miroguide_categorylist.xml
miroguide_channellist_item.xml
miroguide_channelview.xml
miroguide_itemlist_item.xml
miroguidesearch.xml
onlinefeedview_header.xml
opml_import.xml
opml_selection.xml
organize_queue_listitem.xml
organize_queue.xml
playbackhistory_activity.xml
player_widget.xml
searchlist_item.xml
searchlist.xml
simplechapter_item.xml
storage_error.xml
time_dialog.xml