diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-03-28 01:58:05 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-03-28 01:58:05 +0000 |
| commit | a6e85956d2fd510a59813eb9a6a466fb0cccd0db (patch) | |
| tree | c227f9a3afdf84a3c687be32d50708f9ac5b004c /ChangeLog.pre-2-6 | |
| parent | b14b577d59ac904a3e6cbd7cfa53117cfe1dbb5e (diff) | |
| download | gtk+-a6e85956d2fd510a59813eb9a6a466fb0cccd0db.tar.gz | |
Fix up merge slipup.
Mon Mar 27 20:56:14 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_queue_clear_area): Fix up
merge slipup.
* gdk/gdkinput.h: Fix missing line from merge.
Diffstat (limited to 'ChangeLog.pre-2-6')
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cdc97adc12..723938d998 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,7 +1,14 @@ +Mon Mar 27 20:56:14 2000 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkwidget.c (gtk_widget_queue_clear_area): Fix up + merge slipup. + + * gdk/gdkinput.h: Fix missing line from merge. + Mon Mar 27 20:39:49 2000 Owen Taylor <otaylor@redhat.com> * gdk/gdkcolor.c cursor.c gdkdraw.c gdkfont.c: Include gdkinternals.h - instead of gdkprivate.h + instead of gdkprivate.h. Sun Mar 12 15:19:24 2000 Owen Taylor <otaylor@redhat.com> |