diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-12-31 03:17:02 +0100 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-12-31 03:17:02 +0100 |
| commit | c76bd9ba080e154672de913967e0e5b7ea6f9cab (patch) | |
| tree | d924d27c22274eb4115eddefb207b64a0fee7ebe /res/values-large/dimens.xml | |
| parent | bad86d8284fb48bd130370eefb8d8c7ae25ab44c (diff) | |
| parent | 8fbd1ecf9ceec0523447346c1ae93e0cb612a96a (diff) | |
| download | AntennaPod-c76bd9ba080e154672de913967e0e5b7ea6f9cab.zip | |
Merge branch 'develop_flattr_queue_autoflattr' of git://github.com/peschmae0/AntennaPod into flattr_queue_autoflattr
Conflicts:
src/de/danoeh/antennapod/storage/DBReader.java
src/de/danoeh/antennapod/storage/PodDBAdapter.java
Diffstat (limited to 'res/values-large/dimens.xml')
0 files changed, 0 insertions, 0 deletions