cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tim...@apache.org
Subject js commit: Merging version update
Date Sat, 20 Apr 2013 00:11:34 GMT
Updated Branches:
  refs/heads/2.7.x c524f9fc0 -> c71daa2d0


Merging version update


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/c71daa2d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/c71daa2d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/c71daa2d

Branch: refs/heads/2.7.x
Commit: c71daa2d0d08a48484c492573e0c786b88720fd8
Parents: c524f9f
Author: Tim Kim <timk@adobe.com>
Authored: Fri Apr 19 14:30:20 2013 -0700
Committer: Tim Kim <timk@adobe.com>
Committed: Fri Apr 19 17:06:52 2013 -0700

----------------------------------------------------------------------
 VERSION                                     |    4 ++++
 lib/bada/plugin/bada/device.js              |    4 ++++
 lib/blackberry/plugin/air/device.js         |    4 ++++
 lib/blackberry/plugin/qnx/device.js         |    4 ++++
 lib/tizen/plugin/tizen/Device.js            |    4 ++++
 lib/windows8/plugin/windows8/DeviceProxy.js |    4 ++++
 6 files changed, 24 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c71daa2d/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 437459c..e25bd96 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,5 @@
+<<<<<<< HEAD
 2.5.0
+=======
+2.7.0rc1
+>>>>>>> 4808bda... Fixed version number

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c71daa2d/lib/bada/plugin/bada/device.js
----------------------------------------------------------------------
diff --git a/lib/bada/plugin/bada/device.js b/lib/bada/plugin/bada/device.js
index c2db705..887b134 100644
--- a/lib/bada/plugin/bada/device.js
+++ b/lib/bada/plugin/bada/device.js
@@ -69,7 +69,11 @@ Device.prototype.getDeviceInfo = function(success, fail, args) {
            me.platform = os_vendor + " " + os_name;
            me.version = os_version;
            me.uuid = uuid;
+<<<<<<< HEAD
            me.cordova = "2.5.0";
+=======
+           me.cordova = "2.7.0rc1";
+>>>>>>> 4808bda... Fixed version number
            success(me);
        }
    };

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c71daa2d/lib/blackberry/plugin/air/device.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/air/device.js b/lib/blackberry/plugin/air/device.js
index 4050a0a..d08c13e 100644
--- a/lib/blackberry/plugin/air/device.js
+++ b/lib/blackberry/plugin/air/device.js
@@ -35,7 +35,11 @@ module.exports = {
                     model: "PlayBook",
                     name: "PlayBook", // deprecated: please use device.model
                     uuid: info.uuid,
+<<<<<<< HEAD
                     cordova: "2.5.0"
+=======
+                    cordova: "2.7.0rc1"
+>>>>>>> 4808bda... Fixed version number
                 });
             }),
             request = new blackberry.transport.RemoteFunctionCall("org/apache/cordova/getDeviceInfo");

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c71daa2d/lib/blackberry/plugin/qnx/device.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/qnx/device.js b/lib/blackberry/plugin/qnx/device.js
index 7c44ddd..3cba5a8 100644
--- a/lib/blackberry/plugin/qnx/device.js
+++ b/lib/blackberry/plugin/qnx/device.js
@@ -33,7 +33,11 @@ module.exports = {
             model: "Dev Alpha",
             name: "Dev Alpha", // deprecated: please use device.model
             uuid: blackberry.identity.uuid,
+<<<<<<< HEAD
             cordova: "2.5.0"
+=======
+            cordova: "2.7.0rc1"
+>>>>>>> 4808bda... Fixed version number
         });
 
         return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "Device info returned"
};

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c71daa2d/lib/tizen/plugin/tizen/Device.js
----------------------------------------------------------------------
diff --git a/lib/tizen/plugin/tizen/Device.js b/lib/tizen/plugin/tizen/Device.js
index 8e5f83a..8a0c9f3 100644
--- a/lib/tizen/plugin/tizen/Device.js
+++ b/lib/tizen/plugin/tizen/Device.js
@@ -29,7 +29,11 @@ function Device() {
     this.version = null;
     this.uuid = null;
     this.name = null;
+<<<<<<< HEAD
     this.cordova = "2.5.0";
+=======
+    this.cordova = "2.7.0rc1";
+>>>>>>> 4808bda... Fixed version number
     this.platform = "Tizen";
 
     var me = this;

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c71daa2d/lib/windows8/plugin/windows8/DeviceProxy.js
----------------------------------------------------------------------
diff --git a/lib/windows8/plugin/windows8/DeviceProxy.js b/lib/windows8/plugin/windows8/DeviceProxy.js
index 7826c72..c5d27ba 100644
--- a/lib/windows8/plugin/windows8/DeviceProxy.js
+++ b/lib/windows8/plugin/windows8/DeviceProxy.js
@@ -50,7 +50,11 @@ module.exports = {
         }
 
         setTimeout(function () {
+<<<<<<< HEAD
             win({ platform: "windows8", version: "8", name: name, uuid: deviceId, cordova:
"2.5.0" });
+=======
+            win({ platform: "windows8", version: "8", name: name, uuid: deviceId, cordova:
"2.7.0rc1" });
+>>>>>>> 4808bda... Fixed version number
         }, 0);
     }
 


Mime
View raw message