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

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository node-convert-source-map.

commit 1bc18ac6bd5ef879ec564b8bb2f84c8c967efa89
Merge: 8aec25f daee0da
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Fri Aug 7 21:52:14 2015 +0200

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1
    
    # gpg: Signature made Fri 07 Aug 2015 09:52:04 PM CEST
    # gpg:                using RSA key 0x733E6BF93CE8F6D9
    # gpg: Good signature from "Ross Gammon (Rosco) <rossgammon at mail.dk>"
    # gpg:                 aka "Ross Gammon (Genealogy) <genealogy at the-gammons.net>"
    # gpg:                 aka "Ross Gammon (www.one-name.org) <gammon at one-name.org>"
    # gpg:                 aka "Ross Gammon (www.the-gammons.net) <ross at the-gammons.net>"
    # gpg:                 aka "[jpeg image of size 3524]"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: FBEE 0190 904F 1EA0 BA6A  300E 53FE 7BBD A689 10FC
    #      Subkey fingerprint: 7AEE BC7A 44AB 8B90 5CA7  8FC6 733E 6BF9 3CE8 F6D9

 index.js              | 18 +++++++++++-------
 package.json          |  2 +-
 test/comment-regex.js | 47 ++++++++++++++++++++++++++---------------------
 3 files changed, 38 insertions(+), 29 deletions(-)

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