summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ed08bd3..9daeb85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,7 +32,6 @@
* win/Makefile.in (test, winhelp, tktest): corrected the
TCL_LIBRARY path specification.
->>>>>>> 1.236
2000-10-18 Eric Melski <ericm@ajubasolutions.com>
* win/tkWinDraw.c (RenderObject): Applied patch from [Bug: 6368],