[tomcat-native] 02/08: Merge tag 'upstream/1.2.10'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository tomcat-native.

commit b8064739ae071a186fe0ec22d39a14e6ad578c42
Merge: 89aecfc 60c1583
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Nov 13 22:32:28 2016 +0100

    Merge tag 'upstream/1.2.10'
    
    Upstream version 1.2.10

 CHANGELOG.txt                     |  8 ++++++++
 build.properties.default          |  2 +-
 docs/index.html                   |  4 ++--
 docs/miscellaneous/changelog.html | 10 ++++++++++
 docs/news/2016.html               |  6 ++++++
 native/build/config.guess         | 10 +++++-----
 native/build/config.sub           | 22 ++++++++--------------
 native/include/tcn_version.h      |  2 +-
 native/os/win32/libtcnative.rc    |  6 +++---
 native/srclib/VERSIONS            |  2 +-
 native/tcnative.spec              |  2 +-
 xdocs/index.xml                   |  4 ++--
 xdocs/miscellaneous/changelog.xml | 12 ++++++++++++
 xdocs/news/2016.xml               |  6 ++++++
 14 files changed, 66 insertions(+), 30 deletions(-)

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