[apr] 01/04: Merge branch 'upstream'

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr.

commit 1f3193d2951c871be21c38e086304167089ab6c7
Merge: 6c74715 50c7507
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Aug 15 13:09:49 2015 +0200

    Merge branch 'upstream'

 CHANGES                     |  63 ++++++-
 CMakeLists.txt              |   9 +-
 Makefile.in                 |   6 +-
 NOTICE                      |   2 +-
 NWGNUmakefile               |   5 +-
 apr.dsp                     |  63 -------
 apr.spec                    |   4 +-
 atomic/win32/apr_atomic.c   |  57 +-----
 build-outputs.mk            |   2 +-
 build/NWGNUenvironment.inc  |  23 ++-
 build/NWGNUmakefile         |  10 +
 build/apr_hints.m4          |   2 +-
 build/config.guess          |  10 +-
 build/config.sub            |  22 ++-
 build/nw_export.inc         |   2 +
 build/rpm/apr.spec.in       |   2 +-
 configure                   |  73 +++++++-
 configure.in                |  35 +++-
 encoding/apr_escape.c       |   2 +
 file_io/win32/pipe.c        |  51 ++++-
 include/apr_skiplist.h      |  16 +-
 include/apr_version.h       |   4 +-
 libapr.dsp                  |  75 +-------
 locks/beos/thread_cond.c    |   3 +-
 locks/unix/proc_mutex.c     |  22 ++-
 memory/unix/apr_pools.c     |  26 +--
 misc/unix/errorcodes.c      |  11 +-
 network_io/unix/sockaddr.c  |  10 +
 network_io/unix/sockets.c   |  34 +++-
 poll/unix/epoll.c           |  45 +++--
 poll/unix/kqueue.c          |  33 +++-
 poll/unix/poll.c            |  30 ++-
 poll/unix/pollcb.c          |   3 +
 poll/unix/port.c            |  33 +++-
 poll/unix/z_asio.c          |  13 +-
 tables/apr_skiplist.c       | 373 +++++++++++++++++++++---------------
 test/Makefile.in            |   2 +-
 test/Makefile.win           |   3 +-
 test/NWGNUaprtest           |   2 +
 test/abts_tests.h           |   3 +-
 test/testatomic.c           |   6 +-
 test/testdll.dsp            |   4 +
 test/testlib.dsp            |   4 +
 test/testpoll.c             |  53 +++++-
 test/testskiplist.c         | 448 ++++++++++++++++++++++++++++++++++++++++++++
 test/testutil.h             |   1 +
 threadproc/netware/thread.c |   8 +-
 47 files changed, 1233 insertions(+), 475 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git