Commit Graph

6 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 c063fe556c Checkout 'gradle-support' branch 2013-08-07 13:49:11 +02:00
daniel oeh 3f39e37ee4 Removed Acionbarsherlock and Viewpagerindicator submodules 2013-08-07 11:45:48 +02:00
daniel oeh 2bf99545c2 Added dragsort-listview-library 2013-02-18 12:36:10 +01:00
daniel oeh b2017088cc Added submodules 2013-01-11 23:31:52 +01:00