Merge branch 'master' into 4.0.x

This commit is contained in:
Ian Clelland
2014-09-15 12:16:03 -04:00
2 changed files with 15 additions and 18 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
// Platform: android
// 3.7.0-dev-8f41e8d
// 3.7.0-dev-1258511
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-8f41e8d';
var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-1258511';
// file: src/scripts/require.js
/*jshint -W079 */