[Pkg-javascript-commits] [node-zipfile] 17/34: Merge tag 'upstream/0.5.11+ds'

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-zipfile.

commit 7b3c99c12240acf9f46d6404523c391c110c84ba
Merge: 58b21e5 7655d84
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Dec 20 16:28:29 2016 +0100

    Merge tag 'upstream/0.5.11+ds'
    
    Upstream version 0.5.11+ds
    
    # gpg: Signature faite le mar. 20 déc. 2016 16:28:29 CET
    # gpg:                avec la clef RSA 03C4E7ABB880F524306E48156611C05EDD39F374
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> » [ultime]
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> » [ultime]
    # gpg:                 alias « Jérémy Lal <jerry at eda.sarl> » [ultime]

 deps/unix-include/config.h                  | 197 ++++++++++++++++++++++++++++
 deps/unix-include/zipconf.h                 |  47 +++++++
 deps/win-include/config.h                   |  55 ++++++++
 deps/win-include/zip_set_file_compression.c |  86 ++++++++++++
 deps/win-include/zipconf.h                  | 120 +++++++++++++++++
 test/data/world_merc.zip                    | Bin 0 -> 345387 bytes
 6 files changed, 505 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-zipfile.git