Commit Graph

155 Commits

Author SHA1 Message Date
daniel oeh f6c5251b98 Merge branch 'develop' into playback-speed
Conflicts:
	pom.xml
	src/de/danoeh/antennapod/service/PlaybackService.java
	src/de/danoeh/antennapod/util/playback/PlaybackController.java
2013-08-16 20:15:48 +02:00
daniel oeh 4c9f4cf4de Updated android gradle plugin 2013-08-15 13:25:57 +02:00
daniel oeh b0fdb2e8f1 Restructured unit test folders to support the new build system 2013-08-11 12:52:41 +02:00
daniel oeh dddc01e2e4 Change target sdk version to 18 2013-08-07 20:42:38 +02:00
daniel oeh 5286a8edbc Added gradle buildfile 2013-08-07 11:35:51 +02:00