From 033469851ea1627aad0b1407ce359db4ff9b6006 Mon Sep 17 00:00:00 2001
From: greg <gregc.sg@googlemail.com>
Date: Tue, 26 Jul 2016 19:39:46 +0100
Subject: [PATCH] Update ChangeLog and version numbers

---
 ChangeLog.txt                                       | 13 ++++++++++---
 pom.xml                                             |  2 +-
 .../com/ardublock/block/ardublock.properties        |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 97a8d0f4..3bb1c394 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,10 +2,17 @@ Changelog
 
 ========== Version 1.1.0 ==========
 
+Major Changes:
+None
+
+Minor Changes:
 Add blocks to support FaireBot: https://www.youtube.com/watch?v=ru-OUyFdxc4
-Re-add Tilt Switch block and fix of the pin# bug
-Re-add pin# to LED block instead of #
-Rename "Tests" to "Logical Operators"
+Re-add Tilt Switch block
+
+Patches and Bug Fixes:
+Fix of the'pin# bug' for Tilt Switch block
+Re-add 'pin#' to LED block (instead of '#')
+Rename 'Tests' to 'Logical Operators'
 
 ========== Version 1.0.0 ==========
 
diff --git a/pom.xml b/pom.xml
index 6af31199..4e859de7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>org.ardublock</groupId>
 	<artifactId>ardublock</artifactId>
 	<packaging>jar</packaging>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<name>ArduBlock</name>
 	<description>A Block Programming Language for Arduino</description>
 	<properties>
diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties
index 655ded94..698fa2ba 100644
--- a/src/main/resources/com/ardublock/block/ardublock.properties
+++ b/src/main/resources/com/ardublock/block/ardublock.properties
@@ -437,7 +437,7 @@ ardublock.ui.create_refer=create reference
 ardublock.ui.website=Go to Web Site
 ardublock.ui.serialMonitor=Serial Monitor
 ardublock.ui.saveImage=Save as image...
-ardublock.ui.version=1.1.0.beta.1
+ardublock.ui.version=1.1.0
 
 ardublock.error_msg.digital_var_slot=Digital variable slot must take a 'digital variable' name.\nHint: Look at the 'variable' socket on the highlighted block
 ardublock.error_msg.number_var_slot=Standard variable slot must take a standard 'numeric' variable name.\nHint: Look at the 'variable' socket on the highlighted block