[netty-tcnative] 03/05: Merge tag 'upstream/1.1.33.Fork17'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository netty-tcnative.

commit 7e799a8794f1d008dbaabf2d60ce69ec41d17e3e
Merge: 51a4a3a a9feb62
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun May 22 22:44:43 2016 +0200

    Merge tag 'upstream/1.1.33.Fork17'
    
    Upstream version 1.1.33.Fork17

 boringssl-static/pom.xml            | 51 +++++++++++++++++++++++++++++++------
 openssl-dynamic/pom.xml             |  2 +-
 openssl-dynamic/src/main/c/jnilib.c |  4 +++
 openssl-static/pom.xml              |  2 +-
 pom.xml                             |  9 ++++---
 vs2010.vcxproj.static.template      | 20 +++++++++------
 6 files changed, 67 insertions(+), 21 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-tcnative.git