daniel oeh 02926a6e5f Merge branch 'gpoddernet' into develop ...

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/preferences.xml
	src/de/danoeh/antennapod/activity/PreferenceActivity.java

2013-09-05 15:24:50 +02:00

..

gpodnet_searchable.xml

Added search, taglist, pocdasttaglist etc.

2013-08-24 14:23:31 +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 'gpoddernet' into develop

2013-09-05 15:24:50 +02:00

searchable.xml

Fixed search

2013-08-14 17:22:13 +02:00