Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-01-11 00:15:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
cc052e91ad
AntennaPod/app
History
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
..
dslv@80011c50e4 Changed project structure 2014-09-17 20:51:45 +02:00
src Merge branch 'migration' into develop 2014-10-24 20:40:07 +02:00
build.gradle Merge branch 'migration' into develop 2014-10-24 20:40:07 +02:00
lint.xml Changed project structure 2014-09-17 20:51:45 +02:00
proguard.cfg Changed project structure 2014-09-17 20:51:45 +02:00
settings.gradle Changed project structure 2014-09-17 20:51:45 +02:00