[Pkg-javascript-commits] [node-convert-source-map] 02/11: Merge tag 'upstream/1.5.0'

[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-convert-source-map.

commit e4a77c8f5640fec175f42c34de6476cd88b8e718
Merge: 43e2187 65fd6a6
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sun Apr 16 15:26:38 2017 +0200

    Merge tag 'upstream/1.5.0'
    
    Upstream version 1.5.0
    
    # gpg: Signature faite le dim. 16 avril 2017 15:26:38 CEST
    # gpg:                avec la clef RSA 5D0187B940A245BAD7B0F56A003A1A2DAA41085F
    # gpg:                issuer "roucaries.bastien at gmail.com"
    # gpg: Bonne signature de « Bastien ROUCARIÈS <roucaries.bastien at gmail.com> » [ultime]
    # gpg:                 alias « Bastien ROUCARIÈS <roucaries.bastien+debian at gmail.com> » [ultime]
    # gpg:                 alias « Bastien ROUCARIÈS <roucaries.bastien+bug at gmail.com> » [ultime]
    # gpg:                 alias « Bastien ROUCARIÈS <bastien.roucaries at u-cergy.fr> » [ultime]
    # gpg:                 alias « Bastien ROUCARIÈS <roucaries.bastien+qucs at gmail.com> » [ultime]
    # gpg:                 alias « Bastien ROUCARIÈS (debian address) <rouca at debian.org> » [ultime]

 .travis.yml                |  8 ++++--
 README.md                  | 20 ++++++--------
 example/comment-to-json.js |  6 ++--
 index.js                   | 69 +++++++++++++++-------------------------------
 package.json               |  8 +++---
 test/comment-regex.js      |  9 +++---
 test/convert-source-map.js | 52 ++++++++++++++++++++++++++++++----
 7 files changed, 93 insertions(+), 79 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-convert-source-map.git