941fa9062e
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. # # It looks like you may be committing a merge. # If this is not correct, please remove the file # .git/MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch andrewgaul-buffered-output-stream-flush # All conflicts fixed but you are still merging. # (use "git commit" to conclude merge) # # Changes to be committed: # # modified: src/de/danoeh/antennapod/service/download/HttpDownloader.java # modified: tests/src/de/danoeh/antennapod/test/FeedHandlerTest.java # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # (commit or discard the untracked or modified content in submodules) # # modified: submodules/ActionBarSherlock (modified content, untracked content) # modified: submodules/ViewPagerIndicator (modified content, untracked content) # modified: submodules/dslv (modified content, untracked content) #
AntennaPod
This is the official repository of AntennaPod, a podcast manager for Android.
[AntennaPod on fdroid.org](http://f-droid.org/repository/browse/?fdcategory=Multimedia&fdid=de.danoeh.antennapod&fdpage=1)
License
AntennaPod is licensed under the MIT License. You can find the license text in the LICENSE file.
Translating AntennaPod
If you want to translate AntennaPod into another language, you can visit the Transifex project page.
Building AntennaPod
Information on how to build AntennaPod can be found in the Wiki.
Donate
Bitcoin donations can be sent to this address:
1DzvtuvdW8VhDsq9GUytMyALmsHeaHEKbg