summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-07-18 21:39:18 (GMT)
committernijtmans <nijtmans>2010-07-18 21:39:18 (GMT)
commitf2b6f7a67098a6a6bc0ee9859b22bcfc35eee485 (patch)
tree54c9767f1d304bd2710f1e5ab2b00c81f44ffbcb /ChangeLog
parent801bb6b36320c0030ca52888b390e2f639c03ef3 (diff)
downloadtcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.zip
tcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.tar.gz
tcl-f2b6f7a67098a6a6bc0ee9859b22bcfc35eee485.tar.bz2
[Bug 3031278] fixed merge problem in previous commit.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
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