diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2002-04-20 23:59:48 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2002-04-20 23:59:48 +0000 |
| commit | 06008057b6d1ea26f2a077612fc9e0455bb200c2 (patch) | |
| tree | e5e79d78568d08185b47423e6bf61f16212748bd | |
| parent | 4138ac479b4521b28c3b8cb9ebd45347a1221de4 (diff) | |
| download | gdk-pixbuf-06008057b6d1ea26f2a077612fc9e0455bb200c2.tar.gz | |
remove leftover conflict marker.
| -rw-r--r-- | ChangeLog | 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 |
6 files changed, 0 insertions, 6 deletions
@@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 21c2c75ab..ac960e777 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 21c2c75ab..ac960e777 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 21c2c75ab..ac960e777 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 21c2c75ab..ac960e777 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcontainer.c (gtk_container_focus): include internal diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 21c2c75ab..ac960e777 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the accel path is from a locked accel group. ->>>>>>> 1.3353 Mon Apr 15 15:41:56 2002 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcontainer.c (gtk_container_focus): include internal |