playmusicexporter/playmusiclib
Jan Christian Grünhage 42b72e822a
Merge branch 'feature/automation_fix' into develop
# Conflicts:
#	framework/framework.iml
#	playmusicexporter/playmusicexporter.iml
#	playmusicexporter/src/main/java/re/jcg/playmusicexporter/settings/PlayMusicExporterPreferences.java
2017-01-19 00:23:20 +01:00
..
libs Updated mp3agic lib 2016-05-24 14:29:52 +02:00
src Continued work on new settings 2017-01-14 16:58:16 +01:00
.gitignore Added the playmusiclib 2015-01-24 15:08:38 +01:00
build.gradle Finished AppIntro 2017-01-18 23:40:51 +01:00
playmusiclib.iml Finished AppIntro 2017-01-18 23:40:51 +01:00
proguard-rules.pro Added the playmusiclib 2015-01-24 15:08:38 +01:00