summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-23 04:43:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-23 04:43:56 (GMT)
commitdce46c947bd11b68d1979b9e708d177acfddb911 (patch)
tree8472626ee14870d99d98f1cba4b051368ce24518 /ChangeLog
parent3d7e78f01cd6ddb05fa76bfc7aeb0c9c61392dfa (diff)
parentc65f60aaeff611c42c9d8ecaf6783b5fa5b39f30 (diff)
downloadtcl-dce46c947bd11b68d1979b9e708d177acfddb911.zip
tcl-dce46c947bd11b68d1979b9e708d177acfddb911.tar.gz
tcl-dce46c947bd11b68d1979b9e708d177acfddb911.tar.bz2
fix merge problem on Linux
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aabc5e9..b47f008 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-22 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * tools/genStubs.tcl: Let cygwin share stub table with win32
+ * win/Makefile.in: Don't hardcode dde and reg dll version numbers
+ * win/tclWinSock.c: implement TclpInetNtoa for win32
+ * generic/tclInt.decls: Revert most of [fcc5957e59], since when
+ we let cygwin share the win32 stub table this is no longer necessary
+ * generic/tcl*Decls.h: re-generated
+
2012-05-21 Don Porter <dgp@users.sourceforge.net>
* generic/tclFileName.c: When using Tcl_SetObjLength() calls to grow