You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@logging.apache.org by rm...@apache.org on 2021/11/06 00:43:25 UTC

[logging-log4cxx] 20/20: Merge branch 'master' into LOGCXX-510

This is an automated email from the ASF dual-hosted git repository.

rmiddleton pushed a commit to branch LOGCXX-510
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git

commit 0f76b3b0921c989f90947c9f82e56aaeb66e2491
Merge: 494955f d08a933
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Fri Nov 5 20:39:34 2021 -0400

    Merge branch 'master' into LOGCXX-510

 src/main/cpp/CMakeLists.txt                        |  2 +
 src/main/cpp/class.cpp                             |  2 +
 src/main/cpp/colorendpatternconverter.cpp          | 55 ++++++++++++++++
 src/main/cpp/colorstartpatternconverter.cpp        | 76 ++++++++++++++++++++++
 src/main/cpp/patternlayout.cpp                     |  5 ++
 .../log4cxx/pattern/colorendpatternconverter.h     | 67 +++++++++++++++++++
 .../log4cxx/pattern/colorstartpatternconverter.h   | 67 +++++++++++++++++++
 src/main/include/log4cxx/patternlayout.h           | 19 ++++++
 src/test/cpp/patternlayouttest.cpp                 |  8 +++
 .../resources/input/patternLayout13.properties     | 21 ++++++
 src/test/resources/witness/patternLayout.13        | 10 +++
 11 files changed, 332 insertions(+)