1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6563951..67efc43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-18  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tcl.h   [Bug 3031278] fixed merge problem in previous commit.
+
 2010-07-17  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tcl.h   [Bug 3030870] make itcl 3.x built with pre-8.6 work in 8.6