Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
AntennaPod/tests
History
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
..
res Created test project 2012-08-31 12:54:06 +02:00
src/de/danoeh/antennapod/test Merge branch 'develop' into feedmanager_removal 2013-08-05 14:57:37 +02:00
.classpath Fixed build config files 2013-06-02 16:52:46 +02:00
.project Updated test project config files 2013-01-13 20:53:30 +01:00
AndroidManifest.xml Created test project 2012-08-31 12:54:06 +02:00
lint.xml Updated test project config files 2013-01-13 20:53:30 +01:00
proguard-project.txt Created test project 2012-08-31 12:54:06 +02:00
project.properties Created test project 2012-08-31 12:54:06 +02:00