James Falcon b48c3807fd Merge branch 'playback-speed' into speed ... Conflicts: res/values/arrays.xml res/values/strings.xml src/de/danoeh/antennapod/activity/PreferenceActivity.java src/de/danoeh/antennapod/service/PlaybackService.java		2013-05-06 21:48:18 -05: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	implemented searching algorithm	2012-07-24 13:54:43 +02:00