cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tim...@apache.org
Subject js commit: Ok, really updated version this time
Date Sat, 20 Apr 2013 00:43:22 GMT
Updated Branches:
  refs/heads/2.7.x c71daa2d0 -> 360bd3e65


Ok, really updated version this time


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

Branch: refs/heads/2.7.x
Commit: 360bd3e65c33ce4f01e2efb82d641a565ef3c333
Parents: c71daa2
Author: Tim Kim <timk@adobe.com>
Authored: Fri Apr 19 17:29:05 2013 -0700
Committer: Tim Kim <timk@adobe.com>
Committed: Fri Apr 19 17:29:05 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, 0 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/360bd3e6/lib/bada/plugin/bada/device.js
----------------------------------------------------------------------
diff --git a/lib/bada/plugin/bada/device.js b/lib/bada/plugin/bada/device.js
index 887b134..0ae0095 100644
--- a/lib/bada/plugin/bada/device.js
+++ b/lib/bada/plugin/bada/device.js
@@ -69,11 +69,7 @@ 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/360bd3e6/lib/blackberry/plugin/air/device.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/air/device.js b/lib/blackberry/plugin/air/device.js
index d08c13e..be252e9 100644
--- a/lib/blackberry/plugin/air/device.js
+++ b/lib/blackberry/plugin/air/device.js
@@ -35,11 +35,7 @@ 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/360bd3e6/lib/blackberry/plugin/qnx/device.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/plugin/qnx/device.js b/lib/blackberry/plugin/qnx/device.js
index 3cba5a8..0d805ff 100644
--- a/lib/blackberry/plugin/qnx/device.js
+++ b/lib/blackberry/plugin/qnx/device.js
@@ -33,11 +33,7 @@ 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/360bd3e6/lib/tizen/plugin/tizen/Device.js
----------------------------------------------------------------------
diff --git a/lib/tizen/plugin/tizen/Device.js b/lib/tizen/plugin/tizen/Device.js
index 8a0c9f3..a6a6e94 100644
--- a/lib/tizen/plugin/tizen/Device.js
+++ b/lib/tizen/plugin/tizen/Device.js
@@ -29,11 +29,7 @@ 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/360bd3e6/lib/windows8/plugin/windows8/DeviceProxy.js
----------------------------------------------------------------------
diff --git a/lib/windows8/plugin/windows8/DeviceProxy.js b/lib/windows8/plugin/windows8/DeviceProxy.js
index c5d27ba..5aa0819 100644
--- a/lib/windows8/plugin/windows8/DeviceProxy.js
+++ b/lib/windows8/plugin/windows8/DeviceProxy.js
@@ -50,11 +50,7 @@ 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