diff options
Diffstat (limited to 'ChangeLog.pre-2-0')
-rw-r--r-- | ChangeLog.pre-2-0 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -39,7 +39,6 @@ Thu Feb 21 16:51:17 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkmenushell.c (gtk_menu_shell_key_press): Use _gtk_window_activate_key(), gtk_bindings_activate_event(). ->>>>>>> 1.3066 Thu Feb 21 12:24:22 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkctree.c (gtk_ctree_class_init): Remove some workarounds |