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

..

arrays.xml

Merge branch 'gpoddernet' into develop

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

attrs.xml

Use white background in 'organize queue' list for light theme

2013-02-23 13:35:19 +01:00

colors.xml

Images in podcast directory should now be displayed correctly

2013-08-31 15:42:48 +02:00

dimens.xml

Added subscribe button to online feed view

2013-08-31 14:26:54 +02:00

ids.xml

Added subscription syncing

2013-09-01 13:49:19 +02:00

integers.xml

Episode cache size can now be set to 'unlimited'

2013-04-20 17:14:43 +02:00

strings.xml

Merge branch 'gpoddernet' into develop

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

styles.xml

Removed ActionbarSherlock dependency

2013-08-07 11:35:18 +02:00