no changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-05-27 22:50:55 +00:00 · 1998-05-27 22:50:55 +00:00 · cdb7168d80
commit cdb7168d80
parent 6b0eb19fe8
1 changed files with 1 additions and 0 deletions
--- a/include/wx/log.h
+++ b/include/wx/log.h
@ -50,6 +50,7 @@ typedef unsigned long wxTraceMask;
 typedef unsigned long wxLogLevel;

 // ----------------------------------------------------------------------------
+>>>>>>> 1.2
 // derive from this class to redirect (or suppress, or ...) log messages
 // normally, only a single instance of this class exists but it's not enforced
 // ----------------------------------------------------------------------------