From e5dffcfb0751ceb7acc5a3f1840fde34fa1d5703 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 19 Jan 2015 11:32:27 +0100
Subject: [PATCH] added changelog for 1.0

---
 CHANGELOG.md                                               | 7 +++++++
 build.gradle                                               | 4 ++--
 .../siacs/conversations/generator/AbstractGenerator.java   | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84eb5ee0c..24b431d75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
 ###Changelog
+
+####Version 1.0
+* MUC controls (Affiliaton changes)
+* Added download button to notification
+* Improved security
+* bug fixes + code clean up
+
 ####Version 0.10
 * Support for Message Archive Management
 * Dynamically load message history
diff --git a/build.gradle b/build.gradle
index 19079c51f..b4d0648ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,8 +46,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 41
-		versionName "0.10"
+		versionCode 42
+		versionName "1.0-beta"
 	}
 
 	compileOptions {
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index 870ee7572..501cba912 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -23,7 +23,7 @@ public abstract class AbstractGenerator {
 			"http://jabber.org/protocol/disco#info",
 			"urn:xmpp:avatar:metadata+notify",
 			"urn:xmpp:ping"};
-	public final String IDENTITY_NAME = "Conversations 0.10";
+	public final String IDENTITY_NAME = "Conversations 1.0-beta";
 	public final String IDENTITY_TYPE = "phone";
 
 	private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);