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 2017/12/20 20:31:54 UTC
[cordova-browser] 01/01: fixed merge conflict
This is an automated email from the ASF dual-hosted git repository.
steven pushed a commit to branch 5.0.x
in repository https://gitbox.apache.org/repos/asf/cordova-browser.git
commit 9a76ccec9a8272d933dbb92484f0afed6053b2f7
Merge: 3d31493 e87b6ed
Author: Steve Gill <st...@gmail.com>
AuthorDate: Wed Dec 20 12:31:41 2017 -0800
fixed merge conflict
.gitignore | 1 +
.travis.yml | 1 +
README.md | 2 -
RELEASENOTES.md | 4 +
appveyor.yml | 1 +
bin/template/cordova/browser_handler.js | 13 +++-
node_modules/abbrev/package.json | 3 +-
node_modules/accepts/package.json | 3 +-
node_modules/ansi-regex/package.json | 18 ++---
node_modules/ansi-styles/package.json | 13 +---
node_modules/ansi/package.json | 3 +-
node_modules/array-flatten/package.json | 3 +-
node_modules/balanced-match/package.json | 3 +-
node_modules/base64-js/package.json | 5 +-
node_modules/big-integer/BigInteger.d.ts | 5 ++
node_modules/big-integer/BigInteger.js | 44 +++++------
node_modules/big-integer/BigInteger.min.js | 2 +-
node_modules/big-integer/package.json | 19 +++--
node_modules/body-parser/package.json | 3 +-
node_modules/bplist-parser/package.json | 3 +-
node_modules/brace-expansion/package.json | 3 +-
node_modules/bytes/package.json | 3 +-
node_modules/chalk/package.json | 18 ++---
node_modules/compressible/HISTORY.md | 5 ++
node_modules/compressible/package.json | 27 ++++---
node_modules/compression/package.json | 3 +-
node_modules/concat-map/package.json | 5 +-
node_modules/content-disposition/package.json | 3 +-
node_modules/content-type/package.json | 3 +-
node_modules/cookie-signature/package.json | 5 +-
node_modules/cookie/package.json | 5 +-
node_modules/cordova-common/.travis.yml | 1 +
node_modules/cordova-common/RELEASENOTES.md | 4 +
node_modules/cordova-common/appveyor.yml | 1 +
node_modules/cordova-common/package.json | 17 ++--
.../cordova-common/src/ConfigChanges/ConfigFile.js | 37 ++++++---
node_modules/cordova-registry-mapper/package.json | 3 +-
node_modules/cordova-serve/package.json | 3 +-
node_modules/debug/package.json | 3 +-
node_modules/depd/package.json | 3 +-
node_modules/destroy/package.json | 5 +-
node_modules/ee-first/package.json | 5 +-
node_modules/elementtree/package.json | 3 +-
node_modules/encodeurl/package.json | 3 +-
node_modules/escape-html/package.json | 5 +-
node_modules/escape-string-regexp/package.json | 15 ++--
node_modules/etag/package.json | 3 +-
node_modules/express/package.json | 3 +-
node_modules/finalhandler/package.json | 3 +-
node_modules/forwarded/package.json | 3 +-
node_modules/fresh/package.json | 3 +-
node_modules/glob/package.json | 3 +-
node_modules/has-ansi/package.json | 15 ++--
.../node_modules/setprototypeof/package.json | 3 +-
node_modules/http-errors/package.json | 3 +-
node_modules/iconv-lite/package.json | 3 +-
node_modules/inflight/package.json | 3 +-
node_modules/inherits/package.json | 3 +-
node_modules/ipaddr.js/package.json | 3 +-
node_modules/lodash/package.json | 3 +-
node_modules/media-typer/package.json | 5 +-
node_modules/merge-descriptors/package.json | 5 +-
node_modules/methods/package.json | 5 +-
node_modules/mime-db/package.json | 3 +-
node_modules/mime-types/package.json | 3 +-
node_modules/mime/package.json | 3 +-
node_modules/minimatch/package.json | 3 +-
node_modules/ms/package.json | 3 +-
node_modules/negotiator/package.json | 3 +-
node_modules/nopt/package.json | 3 +-
node_modules/on-finished/package.json | 5 +-
node_modules/on-headers/package.json | 5 +-
node_modules/once/package.json | 3 +-
node_modules/open/package.json | 3 +-
node_modules/os-homedir/package.json | 3 +-
node_modules/os-tmpdir/package.json | 3 +-
node_modules/osenv/package.json | 3 +-
node_modules/parseurl/package.json | 3 +-
node_modules/path-is-absolute/package.json | 3 +-
node_modules/path-to-regexp/package.json | 3 +-
node_modules/plist/package.json | 3 +-
node_modules/proxy-addr/package.json | 3 +-
node_modules/q/CHANGES.md | 8 ++
node_modules/q/package.json | 25 +++---
node_modules/q/q.js | 9 ++-
node_modules/qs/package.json | 3 +-
node_modules/range-parser/package.json | 5 +-
node_modules/raw-body/package.json | 3 +-
node_modules/safe-buffer/package.json | 3 +-
node_modules/sax/package.json | 3 +-
node_modules/semver/package.json | 3 +-
node_modules/send/package.json | 3 +-
node_modules/serve-static/package.json | 3 +-
node_modules/setprototypeof/package.json | 3 +-
node_modules/shelljs/package.json | 3 +-
node_modules/statuses/package.json | 5 +-
node_modules/strip-ansi/package.json | 20 ++---
node_modules/supports-color/package.json | 15 ++--
node_modules/type-is/package.json | 3 +-
node_modules/underscore/package.json | 3 +-
node_modules/unorm/package.json | 5 +-
node_modules/unpipe/package.json | 5 +-
node_modules/util-deprecate/package.json | 3 +-
node_modules/utils-merge/package.json | 3 +-
node_modules/vary/package.json | 3 +-
node_modules/wrappy/package.json | 3 +-
node_modules/xmlbuilder/package.json | 3 +-
node_modules/xmldom/package.json | 22 +++++-
spec/browser_handler.spec.js | 90 ++++++++++++++++++++++
109 files changed, 379 insertions(+), 345 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org