From 56e98757200b40405e615b82659f8937cc080724 Mon Sep 17 00:00:00 2001
From: mmk2410 <marcelmichaelkapfer@yahoo.co.nz>
Date: Wed, 18 Feb 2015 10:10:15 +0100
Subject: [PATCH] Updated Release info

---
 app/build.gradle                       |  4 +-
 app/manifest-merger-release-report.txt | 67 ++++++++++++++++++++++++++
 app/src/main/res/values-de/strings.xml |  2 +-
 app/src/main/res/values/strings.xml    |  2 +-
 4 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 app/manifest-merger-release-report.txt

diff --git a/app/build.gradle b/app/build.gradle
index 618f29a..cbd179e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "de.marcelkapfer.morseconverter"
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "2.0"
     }
     buildTypes {
         release {
diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt
new file mode 100644
index 0000000..8c215fa
--- /dev/null
+++ b/app/manifest-merger-release-report.txt
@@ -0,0 +1,67 @@
+-- Merging decision tree log ---
+manifest
+ADDED from AndroidManifest.xml:23:1
+	package
+		ADDED from AndroidManifest.xml:24:5
+		INJECTED from AndroidManifest.xml:0:0
+		INJECTED from AndroidManifest.xml:0:0
+	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
+application
+ADDED from AndroidManifest.xml:26:5
+MERGED from com.android.support:appcompat-v7:21.0.3:16:5
+MERGED from com.android.support:support-v4:21.0.3:16:5
+MERGED from it.neokree:MaterialNavigationDrawer:1.3:14:5
+MERGED from com.github.markushi:android-ui:1.2:9:5
+MERGED from com.android.support:appcompat-v7:21.0.3:16:5
+MERGED from com.android.support:support-v4:21.0.3:16:5
+MERGED from com.android.support:cardview-v7:21.0.3:16:5
+MERGED from com.android.support:support-v4:21.0.3:16:5
+	android:label
+		ADDED from AndroidManifest.xml:29:9
+	android:allowBackup
+		ADDED from AndroidManifest.xml:27:9
+	android:icon
+		ADDED from AndroidManifest.xml:28:9
+activity#de.marcelkapfer.morseconverter.MainActivity
+ADDED from AndroidManifest.xml:30:9
+	android:label
+		ADDED from AndroidManifest.xml:32:13
+	android:theme
+		ADDED from AndroidManifest.xml:33:13
+	android:name
+		ADDED from AndroidManifest.xml:31:13
+intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
+ADDED from AndroidManifest.xml:34:13
+action#android.intent.action.MAIN
+ADDED from AndroidManifest.xml:35:17
+	android:name
+		ADDED from AndroidManifest.xml:35:25
+category#android.intent.category.LAUNCHER
+ADDED from AndroidManifest.xml:37:17
+	android:name
+		ADDED from AndroidManifest.xml:37:27
+uses-sdk
+INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
+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 it.neokree:MaterialNavigationDrawer:1.3:8:5
+MERGED from com.github.markushi:android-ui:1.2:7:5
+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
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4d5e749..ba37952 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -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 beta \n17th February 2015</string>
+    <string name="aboutVersion">2.0 \n18th February 2015</string>
     <string name="sectionBug">Fehler</string>
     <string name="sectionContact">Kontakt</string>
     <string name="sectionDeveloper">Entwickler</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 21e1c4f..6fcb325 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,7 +43,7 @@
     <string name="sectionHow">How to</string>
     <string name="sectionMissing">Missing Code</string>
     <!--About Texts-->
-    <string name="aboutVersion">2.0 beta \n17th February 2015</string>
+    <string name="aboutVersion">2.0 \n18th February 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>