Patch from Hidetoshi Tajima to fix bad match error when target drawable is

[~andy/gtk] / ChangeLog.pre-2-4

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e287d9284eebfb0d774b140a870664419e946cb6..0582dbac3d213a51d6589aaff302a26bd32f36f4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Fri Nov 30 16:12:21 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix 
+       bad match error when target drawable is not the 
+       same depth as the root window. (#65841)
+
+       * HACKING: Update.
+
 2001-11-29  Matthias Clasen  <matthiasc@poet.de>
 
        * gdk/gdkwindow.c: Typo fix.
@@ -30,6 +38,7 @@ Thu Nov 29 21:35:56 2001  Kristian Rietveld  <kristian@planet.nl>
        assertion here that we were at the end iterator was not correct;
        change code to move us to the end iterator. bug #65731
 
+>>>>>>> 1.2646
 Wed Nov 28 20:05:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove