diff options
| author | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2002-02-22 13:35:03 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2002-02-22 13:35:03 +0000 |
| commit | fb291194e1a4efa9d7a4bede8441c4ea719f1e2b (patch) | |
| tree | 9260edd9be27ba87637726e44320211cca8d3983 | |
| parent | 5d81847f201c1a25c9edf5e522c6f3d12bdb2533 (diff) | |
| download | gtk+-fb291194e1a4efa9d7a4bede8441c4ea719f1e2b.tar.gz | |
remove conflict marker
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 1 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 1 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 1 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 1 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 1 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 1 |
7 files changed, 0 insertions, 7 deletions
@@ -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 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 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -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 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -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 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ca4c76331b..132df9cdaa 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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 |