From bbc6b73b59aaa9ce0c006c5d10ee500737996d9c Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Tue, 27 May 2014 12:34:06 -0700
Subject: [PATCH] changelog and bump to 1.1.0 for publish

---
 CHANGELOG.txt | 34 ++++++++++++++++++++++++++++++++++
 package.json  |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 47f99e5b4..7ba7f7052 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,37 @@
+CHANGES IN VERSION 1.1.0 (from 1.0.0)
+======================================
+
+#### General
+- less buggy xcode locator strategy for iOS and Android
+  - note that for Android this might cause previous xpath selectors not to
+    work, since we now always set compressed hierarchy when getting the xml
+	dump used for xpath
+- fix defaults for swipe duration
+- add fixes for context switching
+- add optional argument 'language' to getStrings
+- update docs and code samples (including adding perl code samples)
+- continue work on appium CI
+- make sure we can't close already ended sessions
+- upgrade all node deps besides express
+
+#### iOS
+- add `-ios uiautomation` strategy doc
+
+#### Android
+- allow for encoding of non-ASCII text
+- clearer activity error messages
+- add language and country support
+- extract strings from apk corresponding to device language instead of default
+  to be used with ID locator strategy
+- update complex find with new uiautomator constants
+- fix issue when passing in multiple avdArgs
+- uninstall before installing remote apk
+
+#### Selendroid
+- update selendroid to 0.10.0
+- add getStrings method
+
+
 CHANGES IN VERSION 1.0.0 (from 1.0.0-beta.2)
 =======================================
 
diff --git a/package.json b/package.json
index db679fdbb..642f86aef 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "firefoxos",
     "testing"
   ],
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": "appium-discuss@googlegroups.com",
   "licenses": [
     {