[cpp-log4shib] 02/03: Merge tag 'upstream/1.0.6'

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/1.0.6-1
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=1d2949df0443f682cbe97b2596fcf4d5d3f6765f

commit 1d2949df0443f682cbe97b2596fcf4d5d3f6765f
Merge: 3dea769 7b63188
Author: Russ Allbery <rra at stanford.edu>
AuthorDate: Thu May 23 19:37:52 2013 -0700

    Merge tag 'upstream/1.0.6'
    
    Upstream version 1.0.6
    
    Conflicts:
            Makefile.am
            debian/Makefile.in

 ChangeLog                                 |    4 +
 INSTALL                                   |  370 +-
 Makefile.am                               |    1 +
 Makefile.in                               |   23 +-
 Portfile                                  |   10 +-
 Portfile.in                               |    8 +-
 aclocal.m4                                | 8638 +----------------------------
 bcb5/Makefile.in                          |    7 +-
 bcb5/log4shib/Makefile.in                 |    7 +-
 bcb5/testCategory/Makefile.in             |    7 +-
 bcb5/testConfig/Makefile.in               |    7 +-
 bcb5/testFixedContextCategory/Makefile.in |    7 +-
 bcb5/testNDC/Makefile.in                  |    7 +-
 bcb5/testPattern/Makefile.in              |    7 +-
 bcb5/testmain/Makefile.in                 |    7 +-
 config/Makefile.in                        |    7 +-
 config/depcomp                            |   86 +-
 configure                                 |   26 +-
 configure.in => configure.ac              |    8 +-
 doc/Makefile.in                           |    7 +-
 doc/html/Makefile.in                      |    7 +-
 include/Makefile.in                       |    7 +-
 include/config.h.in                       |    2 +-
 include/log4shib/Makefile.am              |    4 +-
 include/log4shib/Makefile.in              |   11 +-
 include/log4shib/config-win32.h           |    2 +-
 include/log4shib/threading/Makefile.in    |    7 +-
 log4shib.spec                             |    8 +-
 log4shib.spec.in                          |    4 +
 aclocal.m4 => m4/libtool.m4               | 1643 +-----
 m4/ltoptions.m4                           |  384 ++
 m4/ltsugar.m4                             |  123 +
 m4/ltversion.m4                           |   23 +
 m4/lt~obsolete.m4                         |   98 +
 msvc10/Makefile.in                        |    7 +-
 msvc10/log4shib/Makefile.in               |    7 +-
 msvc10/log4shibDLL/Makefile.in            |    7 +-
 msvc10/log4shibDLL/log4shibDLL.rc         |   10 +-
 msvc10/log4shibDLL/log4shibDLL.vcxproj    |   10 +-
 msvc10/testCategory/Makefile.in           |    7 +-
 msvc10/testMain/Makefile.in               |    7 +-
 msvc10/testNDC/Makefile.in                |    7 +-
 msvc10/testNTEventLog/Makefile.in         |    7 +-
 msvc10/testPattern/Makefile.in            |    7 +-
 msvc6/Makefile.in                         |    7 +-
 msvc6/log4shib/Makefile.in                |    7 +-
 msvc6/log4shibDLL/Makefile.in             |    7 +-
 msvc6/testCategory/Makefile.in            |    7 +-
 msvc6/testDLL/Makefile.in                 |    7 +-
 msvc6/testMain/Makefile.in                |    7 +-
 msvc6/testNDC/Makefile.in                 |    7 +-
 msvc6/testNTEventLog/Makefile.in          |    7 +-
 msvc6/testPattern/Makefile.in             |    7 +-
 msvc8/Makefile.in                         |    7 +-
 msvc8/log4shib/Makefile.in                |    7 +-
 msvc8/log4shibDLL/Makefile.in             |    7 +-
 msvc8/testCategory/Makefile.in            |    7 +-
 msvc8/testDLL/Makefile.in                 |    7 +-
 msvc8/testMain/Makefile.in                |    7 +-
 msvc8/testNDC/Makefile.in                 |    7 +-
 msvc8/testNTEventLog/Makefile.in          |    7 +-
 msvc8/testPattern/Makefile.in             |    7 +-
 msvc9/Makefile.in                         |    7 +-
 msvc9/log4shib/Makefile.in                |    7 +-
 msvc9/log4shibDLL/Makefile.in             |    7 +-
 msvc9/testCategory/Makefile.in            |    7 +-
 msvc9/testDLL/Makefile.in                 |    7 +-
 msvc9/testMain/Makefile.in                |    7 +-
 msvc9/testNDC/Makefile.in                 |    7 +-
 msvc9/testNTEventLog/Makefile.in          |    7 +-
 msvc9/testPattern/Makefile.in             |    7 +-
 openvms/Makefile.in                       |    7 +-
 src/Makefile.am                           |    2 +-
 src/Makefile.in                           |    9 +-
 src/PropertyConfiguratorImpl.cpp          |    8 +-
 tests/Makefile.am                         |    2 +-
 tests/Makefile.in                         |    9 +-
 77 files changed, 1449 insertions(+), 10420 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.