daniel oeh 8337739ab4 Merge branch 'playback-speed' of git://github.com/TheRealFalcon/AntennaPod into playback-speed-tmp ... Conflicts: src/de/danoeh/antennapod/activity/AudioplayerActivity.java src/de/danoeh/antennapod/activity/PreferenceActivity.java src/de/danoeh/antennapod/service/PlaybackService.java src/de/danoeh/antennapod/util/playback/PlaybackController.java		2013-08-16 21:22:35 +02:00
..
miroguide_searchable.xml	Replaced 'miro' in filenames with 'miroguide'	2012-08-02 23:00:01 +02:00
player_widget_info.xml	Fixed widget size for api 14+	2012-07-17 13:28:45 +02:00
preferences.xml	Merge branch 'playback-speed' into speed	2013-05-06 21:48:18 -05:00
searchable.xml	Fixed search	2013-08-14 17:22:13 +02:00