summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorrjohnson <rjohnson>1999-04-21 21:53:19 (GMT)
committerrjohnson <rjohnson>1999-04-21 21:53:19 (GMT)
commit561def0a476b2905df665d317583408e48cb8ff2 (patch)
tree8cccda69f9eed39178211bfcc3361f6d2b711f24 /ChangeLog
parent66168e9811b7b5288bea090ad862a7c39284404f (diff)
downloadtk-561def0a476b2905df665d317583408e48cb8ff2.zip
tk-561def0a476b2905df665d317583408e48cb8ff2.tar.gz
tk-561def0a476b2905df665d317583408e48cb8ff2.tar.bz2
Merged 8-1-0 into mainline.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 11bd657..56c8a64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-04-20 <redman@scriptics.com>
+
+ * xlib/X11/Xlib.h: changed definition of Status type to use a
+ typedef instead of a #define to avoid conflicting with the cygwin
+ win32 headers [Bug 1804]
+
1999-04-15 <stanton@scriptics.com>
* Merged 8.1 branch into the main trunk