daniel oeh
75b13431fe
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
2013-08-05 14:57:37 +02:00
..
2012-10-10 17:36:14 +02:00
2013-04-15 18:53:52 +02:00
2013-02-03 00:14:47 +01:00
2012-10-14 12:56:36 +02:00
2012-11-20 11:16:24 +01:00
2012-07-21 19:48:03 +02:00
2013-02-03 00:14:47 +01:00
2012-10-14 12:56:36 +02:00
2013-04-15 18:53:52 +02:00
2012-10-14 12:56:36 +02:00
2013-08-05 10:45:17 +02:00
2013-04-04 18:21:37 +02:00
2013-08-05 10:45:17 +02:00
2012-12-23 11:10:51 +01:00
2013-03-07 20:02:23 +01:00
2013-08-03 21:24:13 +02:00
2013-05-17 22:00:10 +02:00
2013-05-17 22:00:10 +02:00
2013-05-17 22:00:10 +02:00
2013-05-17 22:00:10 +02:00
2013-05-17 22:00:10 +02:00
2013-05-17 22:00:10 +02:00
2013-04-16 14:57:22 +02:00
2013-05-17 22:00:10 +02:00
2013-05-17 22:00:10 +02:00
2012-07-03 11:41:41 +02:00
2013-02-23 13:28:31 +01:00
2013-05-17 22:00:10 +02:00
2013-04-16 14:57:22 +02:00
2013-05-17 22:00:10 +02:00
2013-05-17 22:00:10 +02:00
2013-05-17 22:00:10 +02:00
2012-11-23 18:44:15 +01:00
2012-07-07 15:05:35 +02:00
2013-05-17 22:00:10 +02:00
2013-04-30 18:09:04 +02:00