tree 4313a4e24aa042e4e592f7a815ed57195b3d8617
parent 88fd7169544bce25d2c4b999ea0905c270c455c4
parent 2fe5572b53047873b3b479fa98b71b5edb56537f
author Thorsten Schöning <tschoening@am-soft.de> 1534747431 +0200
committer Thorsten Schöning <tschoening@am-soft.de> 1534747431 +0200

LOGCXX-500: I wasn't sure about the conflict merging before after merging "master" and simply did it again.

# Conflicts:
#	pom.xml
#	src/main/cpp/appenderskeleton.cpp
#	src/main/cpp/asyncappender.cpp
#	src/main/cpp/fileappender.cpp
#	src/main/cpp/gzcompressaction.cpp
#	src/main/cpp/locationinfo.cpp
#	src/main/cpp/logger.cpp
#	src/main/cpp/loggingevent.cpp
#	src/main/cpp/mutex.cpp
#	src/main/cpp/objectoutputstream.cpp
#	src/main/cpp/odbcappender.cpp
#	src/main/cpp/rollingfileappender.cpp
#	src/main/cpp/smtpappender.cpp
#	src/main/cpp/socket.cpp
#	src/main/cpp/socketappender.cpp
#	src/main/cpp/socketappenderskeleton.cpp
#	src/main/cpp/threadcxx.cpp
#	src/main/cpp/writerappender.cpp
#	src/main/cpp/zipcompressaction.cpp
#	src/main/include/log4cxx/appenderskeleton.h
#	src/main/include/log4cxx/asyncappender.h
#	src/main/include/log4cxx/helpers/messagebuffer.h
#	src/main/include/log4cxx/helpers/objectoutputstream.h
#	src/main/include/log4cxx/helpers/objectptr.h
#	src/main/include/log4cxx/helpers/thread.h
#	src/main/include/log4cxx/net/socketappender.h
#	src/main/include/log4cxx/net/telnetappender.h
#	src/main/include/log4cxx/rolling/timebasedrollingpolicy.h