Merge pull request #21 from jcgruenhage/master

Not sure why this commit is only on master and not on develop.
This commit is contained in:
Jan Christian Grünhage 2017-03-19 14:59:22 +01:00 committed by GitHub
commit 65d5dceec3
3 changed files with 8 additions and 8 deletions

View file

@ -33,8 +33,8 @@ android {
minSdkVersion 21
targetSdkVersion 25
// TODO Change Version with releases
versionCode 107
versionName '0.9.5'
versionCode 108
versionName '0.9.5.1'
vectorDrawables.useSupportLibrary = true
jackOptions {
@ -58,9 +58,9 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':framework')
compile project(':playmusiclib')
compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support:support-v4:25.2.0'
compile 'com.android.support:design:25.2.0'
compile 'com.android.support:support-vector-drawable:25.2.0'
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:support-v4:25.1.1'
compile 'com.android.support:design:25.1.1'
compile 'com.android.support:support-vector-drawable:25.1.1'
compile 'com.github.paolorotolo:appintro:4.1.0'
}

View file

@ -22,7 +22,7 @@
-->
<resources>
<string name="app_name">Play Music Exporter (beta)</string>
<string name="app_name">Play Music Exporter</string>
<string name="navigation_drawer_close">Drawer schließen</string>
<string name="view_type_selection_title">Ansicht</string>
<string name="title_view_rated">Positiv bewertet</string>

View file

@ -22,7 +22,7 @@
<resources>
<string name="app_name">Play Music Exporter (beta)</string>
<string name="app_name">Play Music Exporter</string>
<string name="title_track_detail">Track Detail</string>
<string name="action_select_all">Select all</string>