You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/06/28 17:07:36 UTC
[28/50] [abbrv] ios commit: updated js
updated js
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/9586f942
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/9586f942
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/9586f942
Branch: refs/heads/master
Commit: 9586f9427118893da87502c31ab88bab2d66a933
Parents: 6fa81c3
Author: Steven Gill <st...@gmail.com>
Authored: Thu Jun 13 15:18:26 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Jun 20 14:30:41 2013 -0700
----------------------------------------------------------------------
CordovaLib/cordova.js | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/9586f942/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index c6cf612..1c33e04 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -1,6 +1,7 @@
// Platform: ios
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
// 2.9.0rc1-0-g002f33d
=======
// 2.7.0rc1-84-g62c5786
@@ -8,6 +9,9 @@
=======
// 2.7.0rc1-100-g6a53312
>>>>>>> updated cordovajs, removed globalization and camera
+=======
+// 2.7.0rc1-101-gc6482ac
+>>>>>>> updated js
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -29,6 +33,7 @@
;(function() {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
var CORDOVA_JS_BUILD_LABEL = '2.9.0rc1-0-g002f33d';
=======
var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-84-g62c5786';
@@ -36,6 +41,9 @@ var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-84-g62c5786';
=======
var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-100-g6a53312';
>>>>>>> updated cordovajs, removed globalization and camera
+=======
+var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-101-gc6482ac';
+>>>>>>> updated js
// file: lib/scripts/require.js
var require,