diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-02-17 21:40:04 +0100 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-02-17 21:40:04 +0100 |
| commit | 02653918f0290dcff582987b52cd99c6ea707ed9 (patch) | |
| tree | 41b1c62d9a4a839f543186b604f280d659fbb11a /src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java | |
| parent | a2f841c43e95c8b3743788e7bbc505c90045e73b (diff) | |
| parent | 33b1f107441dc83cc3917078cf9164f00e7ff8b1 (diff) | |
| download | AntennaPod-02653918f0290dcff582987b52cd99c6ea707ed9.zip | |
Merge branch 'flattr_queue_autoflattr' into develop (#331)
Other changes:
- Changed FlattrStatusFetcher into Thread-subclass
- Changed auto-flattr mechanism so that it's compatible with the updated PlaybackService
- Changed a couple of strings
Conflicts:
src/de/danoeh/antennapod/storage/DBReader.java
src/de/danoeh/antennapod/storage/DBWriter.java
src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
src/instrumentationTest/de/test/antennapod/storage/DBReaderTest.java
Diffstat (limited to 'src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java')
0 files changed, 0 insertions, 0 deletions