github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Incrementing version to 2.3.0 final

Browse Source
This commit is contained in:
Joe Bowser
2013-01-02 17:07:21 -08:00
parent 6efeb1471c
commit 7c069f14f8
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/assets/js/cordova.android.js
+4 -4
View File
@@ -1,6 +1,6 @@
// commit 4301bc92e237b59d5515bd7758ab289e454168cb
// commit 4082ee0ba3a8902cba7bd087d0584bb7534e694b
// File generated at :: Mon Dec 10 2012 14:13:09 GMT-0800 (PST)
// File generated at :: Wed Jan 02 2013 16:43:38 GMT-0800 (PST)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -6420,12 +6420,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();