From c8abd030c0cedcc387532f2aa986fd956e46eb4f Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Tue, 10 Dec 2013 14:42:29 -0800
Subject: [PATCH] changelog and bump to 0.12.3 for publish

---
 CHANGELOG.txt                          | 27 ++++++++++++++++++++++++++
 package.json                           |  2 +-
 test/functional/selendroid/web_view.js |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 822f92cd8..94a347061 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,30 @@
+CHANGES IN VERSION 0.12.3 (from 0.12.2)
+=======================================
+
+#### General
+- reset command timeout during mobile: reset
+- fixes for strategy validation ('dynamic' and 'class name' are valid)
+- add --show-config flag to dump appium config and exit
+- add option to set newCommandTimeout to 0 or false to disable it entirely
+  rather than working around it by setting a high value
+- refactor server/main.js -- things were getting ugly
+- fix issue where ForceQuitUnresponsiveApps would try to run even on non-Mac
+  systems
+
+#### iOS
+- change default device for iOS 6 to "iPhone" (non-retina)
+- change Xcode 5.0.1 warning message to indicate an upgrade is possible now
+- add --default-device flag to allow instruments to launch the sim like it
+  used to
+- get rid of deprecated authorization strategy code
+- include ForceQuitUnresponsiveApps output in appium log
+- add --merciful (-m) flag to avoid running ForceQuitUnresponsiveApps. Show
+  Instruments a bit of mercy...or don't.
+
+#### Selendroid
+- upgrade Selendroid to 0.7.0
+
+
 CHANGES IN VERSION 0.12.2 (from 0.12.1b)
 =======================================
 
diff --git a/package.json b/package.json
index 4b35c3cf8..994c83811 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "firefoxos",
     "testing"
   ],
-  "version": "0.12.2",
+  "version": "0.12.3",
   "author": "appium-discuss@googlegroups.com",
   "repository": {
     "type": "git",
diff --git a/test/functional/selendroid/web_view.js b/test/functional/selendroid/web_view.js
index 5cb0ae3a7..1d0d141f4 100644
--- a/test/functional/selendroid/web_view.js
+++ b/test/functional/selendroid/web_view.js
@@ -2,7 +2,7 @@
 "use strict";
 
 var path = require('path')
-  , appPath = path.resolve(__dirname, "../../../sample-code/apps/WebViewDemo/target/selendroid-test-app-0.6.0-SNAPSHOT.apk")
+  , appPath = path.resolve(__dirname, "../../../sample-code/apps/WebViewDemo/target/selendroid-test-app-0.7.0-SNAPSHOT.apk")
   , appPkg = "io.selendroid.testapp"
   , appAct = ".HomeScreenActivity"
   , driverBlock = require("../../helpers/driverblock.js")