Age | Commit message (Collapse) | Author |
|
Conflicts:
res/values/arrays.xml
res/values/strings.xml
src/de/danoeh/antennapod/activity/PreferenceActivity.java
src/de/danoeh/antennapod/service/PlaybackService.java
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This ensures that entries are equally high
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
translation
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
res/values/ids.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|