diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-08-05 14:57:37 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-08-05 14:57:37 +0200 |
| commit | 75b13431fed4dbc4e259ead8a3762143be740432 (patch) | |
| tree | 0107281d2021c326d3acb557b0ad1c1d36019d2e /res/layout/organize_queue.xml | |
| parent | 3f5e2faff941f220c7a882bfba4f86e85219d7ba (diff) | |
| parent | 95148ace8e44df4fa3b8cc6b6afc83bed6be4d04 (diff) | |
| download | AntennaPod-75b13431fed4dbc4e259ead8a3762143be740432.zip | |
Merge branch 'develop' into feedmanager_removal
Conflicts:
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/feed/FeedManager.java
src/de/danoeh/antennapod/service/PlaybackService.java
src/de/danoeh/antennapod/service/download/DownloadService.java
src/de/danoeh/antennapod/service/download/DownloadStatus.java
src/de/danoeh/antennapod/service/download/HttpDownloader.java
src/de/danoeh/antennapod/storage/DownloadRequester.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
src/de/danoeh/antennapod/util/playback/PlaybackController.java
Diffstat (limited to 'res/layout/organize_queue.xml')
0 files changed, 0 insertions, 0 deletions