You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2013/01/03 20:29:24 UTC
[1/4] git commit: update js for 2.3.0
update js for 2.3.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/629817c3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/629817c3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/629817c3
Branch: refs/heads/master
Commit: 629817c355b5a067f04540a1d31b72d04eb1ea59
Parents: eb721c8
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Jan 3 10:41:32 2013 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Jan 3 10:41:32 2013 -0800
----------------------------------------------------------------------
windows8/cordova-2.3.0.js | 8 ++++----
.../samples/Media_Test/Media_Test/cordova-2.3.0.js | 8 ++++----
.../Notification Test/cordova-2.3.0.js | 8 ++++----
windows8/template/www/cordova-2.3.0.js | 8 ++++----
windows8/test/cordova-2.3.0.js | 8 ++++----
5 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/629817c3/windows8/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/windows8/cordova-2.3.0.js b/windows8/cordova-2.3.0.js
index f7c6891..49fe356 100644
--- a/windows8/cordova-2.3.0.js
+++ b/windows8/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:13 GMT-0800 (Pacific Standard Time)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -7600,12 +7600,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();
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/629817c3/windows8/samples/Media_Test/Media_Test/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/windows8/samples/Media_Test/Media_Test/cordova-2.3.0.js b/windows8/samples/Media_Test/Media_Test/cordova-2.3.0.js
index f7c6891..49fe356 100644
--- a/windows8/samples/Media_Test/Media_Test/cordova-2.3.0.js
+++ b/windows8/samples/Media_Test/Media_Test/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:13 GMT-0800 (Pacific Standard Time)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -7600,12 +7600,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();
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/629817c3/windows8/samples/Notification Test/Notification Test/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/windows8/samples/Notification Test/Notification Test/cordova-2.3.0.js b/windows8/samples/Notification Test/Notification Test/cordova-2.3.0.js
index f7c6891..49fe356 100644
--- a/windows8/samples/Notification Test/Notification Test/cordova-2.3.0.js
+++ b/windows8/samples/Notification Test/Notification Test/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:13 GMT-0800 (Pacific Standard Time)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -7600,12 +7600,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();
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/629817c3/windows8/template/www/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/windows8/template/www/cordova-2.3.0.js b/windows8/template/www/cordova-2.3.0.js
index f7c6891..49fe356 100644
--- a/windows8/template/www/cordova-2.3.0.js
+++ b/windows8/template/www/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:13 GMT-0800 (Pacific Standard Time)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -7600,12 +7600,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();
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/629817c3/windows8/test/cordova-2.3.0.js
----------------------------------------------------------------------
diff --git a/windows8/test/cordova-2.3.0.js b/windows8/test/cordova-2.3.0.js
index f7c6891..49fe356 100644
--- a/windows8/test/cordova-2.3.0.js
+++ b/windows8/test/cordova-2.3.0.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 24d65ab645742e8360c3dd16d7a36411cc3383e0
-// File generated at :: Fri Dec 14 2012 15:28:53 GMT-0800 (Pacific Standard Time)
+// File generated at :: Thu Jan 03 2013 10:19:13 GMT-0800 (Pacific Standard Time)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -7600,12 +7600,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();