From ceede8419be84bc138d057107f3c827e67b8274b Mon Sep 17 00:00:00 2001
From: Samer Albahra <salbahra@gmail.com>
Date: Thu, 11 Dec 2014 18:27:02 -0600
Subject: [PATCH] Base: Increment version number

---
 config.xml                                    | 6 +++---
 manifest.json                                 | 2 +-
 manifest.webapp                               | 2 +-
 package.json                                  | 2 +-
 source/osx/Resources/OpenSprinkler-Info.plist | 4 ++--
 www/js/main.js                                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config.xml b/config.xml
index 3537b2bbc..0db0e031c 100644
--- a/config.xml
+++ b/config.xml
@@ -3,8 +3,8 @@
             xmlns:android   = "http://schemas.android.com/apk/res/android"
             xmlns:gap   = "http://phonegap.com/ns/1.0"
             id          = "com.albahra.sprinklers"
-            version     = "1.2.5"
-            versionCode = "41" >
+            version     = "1.2.6"
+            versionCode = "42" >
 
         <preference name="phonegap-version" value="3.6.3" />
         <preference name="DisallowOverscroll" value="true"  />
@@ -31,7 +31,7 @@
         </gap:config-file>
 
         <gap:config-file platform="ios" parent="CFBundleShortVersionString">
-            <string>125</string>
+            <string>126</string>
         </gap:config-file>
 
         <gap:config-file platform="android" parent="/manifest">
diff --git a/manifest.json b/manifest.json
index 290e72c49..e1c9b2d9e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "OpenSprinkler",
   "description": "Designed to allow intuitive control of the OpenSprinkler irrigation controller.",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "manifest_version": 2,
   "app": {
 	  "background": {
diff --git a/manifest.webapp b/manifest.webapp
index 2f423c0bd..0ff0162d0 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -20,5 +20,5 @@
   },
   "default_locale": "en",
   "type": "privileged",
-  "version": "1.2.5"
+  "version": "1.2.6"
 }
diff --git a/package.json b/package.json
index e8a56f6f5..2e3efdbfb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenSprinkler",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Designed to allow intuitive control of the OpenSprinkler irrigation controller.",
   "main": "www/js/main.js",
   "scripts": {
diff --git a/source/osx/Resources/OpenSprinkler-Info.plist b/source/osx/Resources/OpenSprinkler-Info.plist
index 8da967af2..c7ca3a790 100644
--- a/source/osx/Resources/OpenSprinkler-Info.plist
+++ b/source/osx/Resources/OpenSprinkler-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.5</string>
+	<string>1.2.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>12</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/www/js/main.js b/www/js/main.js
index 927c0ca4e..c538cd693 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -6735,7 +6735,7 @@ function show_about() {
                     "</li>" +
                 "</ul>" +
                 "<p class='smaller'>" +
-                    _("App Version")+": 1.2.5" +
+                    _("App Version")+": 1.2.6" +
                     (typeof controller.options.hwv !== "undefined" ? "<br>"+_("Hardware Version")+": v"+getHWVersion() : "") +
                     "<br>"+_("Firmware")+": "+getOSVersion() +
                 "</p>" +