daniel oeh cc052e91ad 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		2014-10-24 20:40:07 +02:00
..
LICENSE_FFMPEGMEDIAMETADATARETRIEVER.txt	Added support for reading MP4 chapters	2014-09-13 20:37:30 +02:00