You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2012/12/21 00:07:02 UTC
ios commit: Interim js to fix 2 File API mobile-spec failures
Updated Branches:
refs/heads/master a88ea87eb -> 534a7a170
Interim js to fix 2 File API mobile-spec failures
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/534a7a17
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/534a7a17
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/534a7a17
Branch: refs/heads/master
Commit: 534a7a1702014b1503a624881cbdd900aa3a3b09
Parents: a88ea87
Author: Shazron Abdullah <sh...@apache.org>
Authored: Thu Dec 20 15:06:48 2012 -0800
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu Dec 20 15:06:48 2012 -0800
----------------------------------------------------------------------
CordovaLib/cordova.ios.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/534a7a17/CordovaLib/cordova.ios.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.ios.js b/CordovaLib/cordova.ios.js
index 54bc68a..0ebc6ca 100644
--- a/CordovaLib/cordova.ios.js
+++ b/CordovaLib/cordova.ios.js
@@ -1,6 +1,6 @@
-// commit 861ff3d507fd5c64ed789d8abe360690e588252e
+// commit 2226b097a5249be30da3f98789860296b2326c65
-// File generated at :: Mon Dec 10 2012 15:38:02 GMT-0800 (PST)
+// File generated at :: Thu Dec 20 2012 15:06:05 GMT-0800 (PST)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -5993,12 +5993,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();