[cpp-log4shib] 02/04: Merge tag 'upstream/1.0.8'

[Scott Cantor]

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

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

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

commit ebfeb590b23d90b2d72f2a23d64d068099c350b5
Merge: 5ce102f 7a6bff0
Author: Russ Allbery <rra at stanford.edu>
AuthorDate: Tue Jun 25 15:59:05 2013 -0700

    Merge tag 'upstream/1.0.8'
    
    Upstream version 1.0.8
    
    Conflicts:
            src/PThreads.cpp

 Portfile                          |  2 +-
 configure                         | 22 +++++++++++-----------
 configure.ac                      |  4 ++--
 include/log4shib/config-win32.h   |  2 +-
 log4shib.spec                     |  4 ++--
 msvc10/log4shibDLL/log4shibDLL.rc |  8 ++++----
 msvc6/log4shibDLL/log4shibDLL.rc  | 10 +++++-----
 msvc8/log4shibDLL/log4shibDLL.rc  | 10 +++++-----
 msvc9/log4shibDLL/log4shibDLL.rc  | 10 +++++-----
 src/PThreads.cpp                  |  8 +++++---
 10 files changed, 41 insertions(+), 39 deletions(-)


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