summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-29 12:45:47 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-29 12:45:47 (GMT)
commit29067ec103d779feffa6d5dea099666cc2785b76 (patch)
tree12d4d15c3f59ae70b1113469422fb33b9039d700 /ChangeLog
parent20ae5845bf5393c40ddd12145483e4c6af9ef77e (diff)
parentd7e1d66497a877b980042968a57edd01d2840818 (diff)
downloadtk-29067ec103d779feffa6d5dea099666cc2785b76.zip
tk-29067ec103d779feffa6d5dea099666cc2785b76.tar.gz
tk-29067ec103d779feffa6d5dea099666cc2785b76.tar.bz2
merge core-8-4-branch, still to be tested on Unixtobetested
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e4aa5d..d0b040c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-25 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tkWindow.c: Simpify determination whether we are running on cygwin.
+ * generic/tkStubInit.c: Export Tk_GetHINSTANCE, TkSetPixmapColormap and
+ * generic/tkInt.decls: TkpPrintWindowId on the Cygwin dll, sync stub table
+ with Tk 8.6 win32 version.
+ * generic/tk*Decls.h: re-generated
+ * win/Makefile.in: Fix "make genstubs" when cross-compiling on UNIX
+
2012-05-24 Jan Nijtmans <nijtmans@users.sf.net>
* win/stubs.c: Change XSetCommand signature to match Xorg,