[Pkg-javascript-commits] [node-acorn-jsx] 480/484: record new upstream branch created by importing node-acorn-jsx_4.0.1.orig.tar.gz 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-acorn-jsx.

commit 6ab4dba2e28669489db69185a7067fe49e7d7a65
Merge: 828f716 3ee4301
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Thu Aug 17 17:40:45 2017 +0200

    record new upstream branch created by importing node-acorn-jsx_4.0.1.orig.tar.gz and merge it

 .travis.yml       |  8 +++++++-
 LICENSE           |  2 +-
 debian/.git-dpm   | 14 +++++++-------
 inject.js         | 13 +++++++++++--
 package.json      |  6 +++---
 test/tests-jsx.js | 52 +++++++++++++++++++++++++++++++++++++++++-----------
 6 files changed, 70 insertions(+), 25 deletions(-)

diff --cc debian/.git-dpm
index 7234369,0000000..1b53b6f
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
- 05852d8ae9476b7f8a25e417665e2265528d5fb9
- 05852d8ae9476b7f8a25e417665e2265528d5fb9
- 05852d8ae9476b7f8a25e417665e2265528d5fb9
- 05852d8ae9476b7f8a25e417665e2265528d5fb9
- node-acorn-jsx_3.0.1+20160502git05852d8ae94.orig.tar.xz
- f0747dd8a21a9c0bced712ea011712d4356dac93
- 13988
++3ee4301300a38ba8a747469746ee65b59b0ddd92
++3ee4301300a38ba8a747469746ee65b59b0ddd92
++3ee4301300a38ba8a747469746ee65b59b0ddd92
++3ee4301300a38ba8a747469746ee65b59b0ddd92
++node-acorn-jsx_4.0.1.orig.tar.gz
++4cfa92f1f8752e1366cf8a1e1a0203811063da80
++17938

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