AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

remove leftover conflict marker.

Browse Source
This commit is contained in:
Matthias Clasen 2002-04-20 23:59:48 +00:00
parent 4138ac479b
commit 06008057b6
6 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

1
ChangeLog.pre-2-10
View File

@ -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

1
ChangeLog.pre-2-2
View File

@ -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

1
ChangeLog.pre-2-4
View File

@ -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

1
ChangeLog.pre-2-6
View File

@ -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

1
ChangeLog.pre-2-8
View File

@ -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