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

[Stefan Fritsch]

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

sf pushed a commit to annotated tag debian/1.5.1-1
in repository apr.

commit b71cfee2b5890d63477ae755527b74d5393a4ace
Merge: f8cba61 7b14536
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu May 1 10:33:50 2014 +0200

    Merge branch 'upstream'

 CHANGES                            |  43 +++++++-
 CMakeLists.txt                     |  10 +-
 Makefile.in                        |   7 +-
 NOTICE                             |   4 +-
 README.cmake                       |   2 +
 apr.spec                           |   2 +-
 build-outputs.mk                   |   2 +-
 build/config.guess                 | 184 +++++----------------------------
 build/config.sub                   |   6 +-
 configure                          |  19 ++++
 configure.in                       |   7 ++
 docs/canonical_filenames.html      |   6 +-
 encoding/apr_escape.c              |  45 ++++++--
 file_io/unix/mktemp.c              |   2 +-
 file_io/win32/dir.c                |  41 ++++----
 file_io/win32/open.c               |   2 +-
 file_io/win32/pipe.c               |   2 +-
 include/apr_escape.h               |  26 ++---
 include/apr_file_info.h            |   2 +-
 include/apr_file_io.h              |   2 -
 include/apr_fnmatch.h              |  18 ++--
 include/apr_lib.h                  |  26 ++---
 include/apr_network_io.h           |   2 +
 include/apr_poll.h                 |  10 +-
 include/apr_skiplist.h             | 203 ++++++++++++++++++++++++++++++++++---
 include/apr_strings.h              |   8 +-
 include/apr_thread_mutex.h         |   2 +-
 include/apr_time.h                 |  36 +++----
 include/apr_version.h              |   4 +-
 include/arch/netware/apr_private.h |   2 +-
 locks/unix/proc_mutex.c            |  11 +-
 network_io/unix/socket_util.c      |   3 +-
 network_io/unix/sockets.c          |  15 ++-
 shmem/unix/shm.c                   | 101 ++++++++++++++++--
 test/sockchild.c                   |   8 +-
 test/testatomic.c                  |  12 +++
 test/testdir.c                     | 135 ++++++++++++++++++++++++
 test/testescape.c                  |   2 +
 test/testmmap.c                    |  22 ++--
 test/testsock.c                    |  55 +++++++++-
 40 files changed, 785 insertions(+), 304 deletions(-)

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