From 28ac080e4df06143e8f57b9dc2a0ff8b2f392aa8 Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Fri, 2 May 2014 18:33:27 -0700
Subject: [PATCH] changelog and bump to 1.0.0 for publish

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4ffad5b94..60bbc1b44 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,28 @@
+CHANGES IN VERSION 1.0.0 (from 1.0.0-beta.2)
+=======================================
+
+#### General
+- update python samples to use 1.0 style
+- don't convert 'proxy' or 'launchTimeout' caps into strings
+- make sure commit hooks use local grunt and mocha
+- update some ruby samples to use 1.0 style
+- add more 1.0 docs and sample code
+
+#### iOS
+- fix mobile safari native tap on android by offsetting tap position by 40px
+- go back to using unpatched UICatalog
+- fix autoAcceptAlerts
+- allow multiple calls to /contexts
+- update appium-instruments with fix that would prevent the basic 'iPhone
+  Simulator' device from launching correctly
+
+#### Android
+- fix gesture timing so it doesn't interpret ms as seconds
+
+#### Selendroid
+- ensure selendroid isn't proxied appium endpoint commands
+
+
 CHANGES IN VERSION 1.0.0-beta.2 (from 1.0.0-beta.1)
 =======================================
 
diff --git a/package.json b/package.json
index becb0ff16..53adaff22 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "firefoxos",
     "testing"
   ],
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0",
   "author": "appium-discuss@googlegroups.com",
   "licenses": [
     {