[Pkg-javascript-commits] [node-browser-pack] 16/27: record new upstream branch and merge it

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-browser-pack.

commit da194c6e61de3b2207fcd34e61d7809b812c5ffd
Merge: 3a05271 e78638c
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sun Feb 18 21:55:08 2018 +0100

    record new upstream branch and merge it

 .travis.yml     |  4 ++++
 CHANGELOG.md    |  7 +++++++
 debian/.git-dpm | 14 +++++++-------
 index.js        | 26 ++++++++++++++++----------
 package.json    | 12 +++++++-----
 prelude.js      | 10 ++++++++--
 readme.markdown |  4 +---
 7 files changed, 50 insertions(+), 27 deletions(-)

diff --cc debian/.git-dpm
index c16ce15,0000000..b45aacc
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 3f4f699d248d38c35e2daa7afab621c7f2cae28e
- 3f4f699d248d38c35e2daa7afab621c7f2cae28e
- 3f4f699d248d38c35e2daa7afab621c7f2cae28e
- 3f4f699d248d38c35e2daa7afab621c7f2cae28e
- node-browser-pack_6.0.2+ds.orig.tar.gz
- 12842591f8b8bdb0ea36c2d068448f7d5329df50
- 6973
++e78638c1f3ba5ea0eb880648d3ace95317ce4316
++e78638c1f3ba5ea0eb880648d3ace95317ce4316
++e78638c1f3ba5ea0eb880648d3ace95317ce4316
++e78638c1f3ba5ea0eb880648d3ace95317ce4316
++node-browser-pack_6.0.4.orig.tar.gz
++f537cfaa43915248c301feefec9ea6ea3c4a27bd
++7798

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-browser-pack.git