diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-10-24 20:40:07 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-10-24 20:40:07 +0200 |
| commit | cc052e91ad8a87b00b93649ec0f6a06bcae6267a (patch) | |
| tree | 12cacac4fb5c94af2955812a3167eefb325f286d /.project | |
| parent | baa7d5f11283cb7668d45b561af5d38f0ccb9632 (diff) | |
| parent | b5066d02b4acf31da093190a1a57a9d961bb04ca (diff) | |
| download | AntennaPod-cc052e91ad8a87b00b93649ec0f6a06bcae6267a.zip | |
Merge branch 'migration' into develop
Non-GUI classes have been moved into the 'core' project in order to allow AntennaPod SP to reference it as a subproject.
Conflicts:
app/src/main/AndroidManifest.xml
build.gradle
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSSimpleChapters.java
core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java
gradle/wrapper/gradle-wrapper.properties
pom.xml
Diffstat (limited to '.project')
0 files changed, 0 insertions, 0 deletions