[Pkg-javascript-commits] [node-nan] 02/04: Merge tag 'upstream/2.3.5'

[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-nan.

commit 675716513596bb4b7f1d9aa3f630918e638a7009
Merge: 5112f80 4e45e96
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Jul 1 17:53:12 2016 +0200

    Merge tag 'upstream/2.3.5'
    
    Upstream version 2.3.5
    
    # gpg: Signature faite le ven. 01 juil. 2016 17:53:05 CEST avec la clef RSA d'identifiant DD39F374
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> »
    # gpg:                 alias « Jérémy Lal <jerry at eda.sarl> »

 .npmignore                       |   3 +
 .travis.yml                      |   2 +-
 CHANGELOG.md                     |  25 ++-
 README.md                        |   2 +-
 appveyor.yml                     |   2 +-
 doc/methods.md                   |   9 +-
 nan.h                            | 350 +++++++++++++++++++++------------------
 nan_callbacks_pre_12_inl.h       |   2 +-
 nan_converters.h                 |   2 +-
 nan_implementation_12_inl.h      |   5 +
 nan_maybe_43_inl.h               |  88 +++++-----
 nan_maybe_pre_43_inl.h           |  96 +++++------
 nan_object_wrap.h                |   4 +-
 nan_persistent_12_inl.h          |  46 ++---
 nan_persistent_pre_12_inl.h      |  76 ++++-----
 nan_typedarray_contents.h        |   8 +-
 nan_weak.h                       |  38 +++--
 package.json                     |   4 +-
 test/cpp/objectwraphandle.cpp    |   6 +
 test/cpp/settemplate.cpp         |  15 ++
 test/js/objectwraphandle-test.js |   4 +-
 21 files changed, 452 insertions(+), 335 deletions(-)

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