You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2013/01/03 07:19:06 UTC
git commit: updating javascript and VERSION
Updated Branches:
refs/heads/master 4b1535565 -> a5ebe1c7a
updating javascript and VERSION
Project: http://git-wip-us.apache.org/repos/asf/cordova-tizen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-tizen/commit/a5ebe1c7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-tizen/tree/a5ebe1c7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-tizen/diff/a5ebe1c7
Branch: refs/heads/master
Commit: a5ebe1c7a4d420f81119d528d255f2a8e3edd020
Parents: 4b15355
Author: Anis Kadri <an...@gmail.com>
Authored: Wed Jan 2 22:18:59 2013 -0800
Committer: Anis Kadri <an...@gmail.com>
Committed: Wed Jan 2 22:18:59 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
js/cordova.tizen.js | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-tizen/blob/a5ebe1c7/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index bcf7441..276cbf9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.0rc2
+2.3.0
http://git-wip-us.apache.org/repos/asf/cordova-tizen/blob/a5ebe1c7/js/cordova.tizen.js
----------------------------------------------------------------------
diff --git a/js/cordova.tizen.js b/js/cordova.tizen.js
index f5ff389..956422b 100644
--- a/js/cordova.tizen.js
+++ b/js/cordova.tizen.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
-// File generated at :: Mon Dec 10 2012 14:51:17 GMT-0800 (PST)
+// File generated at :: Wed Jan 02 2013 22:16:07 GMT-0800 (PST)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -6479,7 +6479,7 @@ function Device() {
this.version = null;
this.uuid = null;
this.name = null;
- this.cordova = "2.3.0rc2";
+ this.cordova = "2.3.0";
this.platform = "Tizen";
var me = this;
@@ -7772,12 +7772,12 @@ window.cordova = require('cordova');
// Drop the common globals into the window object, but be nice and don't overwrite anything.
builder.buildIntoButDoNotClobber(base.defaults, context);
- builder.buildIntoAndMerge(base.merges, context);
builder.buildIntoAndClobber(base.clobbers, context);
+ builder.buildIntoAndMerge(base.merges, context);
builder.buildIntoButDoNotClobber(platform.defaults, context);
- builder.buildIntoAndMerge(platform.merges, context);
builder.buildIntoAndClobber(platform.clobbers, context);
+ builder.buildIntoAndMerge(platform.merges, context);
// Call the platform-specific initialization
platform.initialize();