Version 2.1 preparations

This commit is contained in:
Marcel Kapfer 2015-03-10 23:05:56 +01:00
parent db75fa878b
commit 8104b286d3
4 changed files with 8 additions and 8 deletions

View file

@ -8,8 +8,8 @@ android {
applicationId "de.marcelkapfer.morseconverter"
minSdkVersion 11
targetSdkVersion 21
versionCode 3
versionName "2.0"
versionCode 4
versionName "2.1"
}
buildTypes {
release {

View file

@ -1,6 +1,8 @@
-- Merging decision tree log ---
manifest
ADDED from AndroidManifest.xml:23:1
xmlns:android
ADDED from AndroidManifest.xml:23:11
package
ADDED from AndroidManifest.xml:24:5
INJECTED from AndroidManifest.xml:0:0
@ -8,8 +10,6 @@ ADDED from AndroidManifest.xml:23:1
android:versionName
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
xmlns:android
ADDED from AndroidManifest.xml:23:11
android:versionCode
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
@ -57,11 +57,11 @@ MERGED from com.android.support:appcompat-v7:21.0.3:15:5
MERGED from com.android.support:support-v4:21.0.3:15:5
MERGED from com.android.support:cardview-v7:21.0.3:15:5
MERGED from com.android.support:support-v4:21.0.3:15:5
tools:overrideLibrary
ADDED from it.neokree:MaterialNavigationDrawer:1.3:11:9
android:targetSdkVersion
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
android:minSdkVersion
INJECTED from AndroidManifest.xml:0:0
INJECTED from AndroidManifest.xml:0:0
tools:overrideLibrary
ADDED from it.neokree:MaterialNavigationDrawer:1.3:11:9

View file

@ -38,7 +38,7 @@
<string name="aboutBug">Wenn Du einen Fehler gefunden hast, schreibe mit bitte ein Email an marcelmichaelkapfer@yahoo.co.nz</string>
<string name="aboutHow">Du kannst eine ausführliche Anwendung auf marcel-kapfer.de/projects/morse/index.html#howto_android finden.</string>
<string name="aboutMissing">Wenn du auf einen fehlenden Code aufmerksam geworden bist, dann schreibe eine Email an marcelmichaelkapfer@yahoo.co.nz.</string>
<string name="aboutVersion">2.0 \n18th February 2015</string>
<string name="aboutVersion">2.1 \n10. März 2015</string>
<string name="sectionBug">Fehler</string>
<string name="sectionContact">Kontakt</string>
<string name="sectionDeveloper">Entwickler</string>

View file

@ -43,7 +43,7 @@
<string name="sectionHow">How to</string>
<string name="sectionMissing">Missing Code</string>
<!--About Texts-->
<string name="aboutVersion">2.0 \n18th February 2015</string>
<string name="aboutVersion">2.1\n10th March 2015</string>
<string name="aboutDeveloper" translatable="false">Marcel Michael Kapfer</string>
<string name="aboutWebsite" translatable="false">marcel-kapfer.de/projects/morse/</string>
<string name="aboutContact" translatable="false">marcelmichaelkapfer@yahoo.co.nz</string>