You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/05/14 02:09:55 UTC
[26/27] git commit: Merge branch 'fix-default' of
https://github.com/mozilla-cordova/cordova-firefoxos into 3.5.x
Merge branch 'fix-default' of https://github.com/mozilla-cordova/cordova-firefoxos into 3.5.x
Conflicts:
VERSION
cordova-lib/cordova.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/commit/77e2374b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/77e2374b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/77e2374b
Branch: refs/heads/3.5.x
Commit: 77e2374b69215b889808c85735595511c4382023
Parents: 19d52e6 1c8f9e6
Author: Steven Gill <st...@gmail.com>
Authored: Tue May 13 17:07:51 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Tue May 13 17:07:51 2014 -0700
----------------------------------------------------------------------
bin/templates/project/cordova/defaults.xml | 30 ++++++++++++++++---------
cordova-lib/cordova.js | 2 +-
2 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/77e2374b/cordova-lib/cordova.js
----------------------------------------------------------------------
diff --cc cordova-lib/cordova.js
index aeadf48,2c4c7ac..62d613c
--- a/cordova-lib/cordova.js
+++ b/cordova-lib/cordova.js
@@@ -1522,4 -1522,4 +1522,4 @@@ window.cordova = require('cordova')
require('cordova/init');
--})();
++})();