AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 14:00:09 +00:00
Code Issues Projects Releases Wiki Activity

remove conflict marker

Browse Source
This commit is contained in:
Jonathan Blandford 2004-02-28 04:27:23 +00:00
parent fe3e1c95fa
commit deb3d9e506
5 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford <jrb@redhat.com>
For now, use gtk_file_system_insert_bookmark() with -1 for the
position. DnD will come next.
>>>>>>> 1.5045
Fri Feb 27 21:42:28 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_relayout):

1
ChangeLog.pre-2-10
View File

@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford <jrb@redhat.com>
For now, use gtk_file_system_insert_bookmark() with -1 for the
position. DnD will come next.
>>>>>>> 1.5045
Fri Feb 27 21:42:28 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_relayout):

1
ChangeLog.pre-2-4
View File

@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford <jrb@redhat.com>
For now, use gtk_file_system_insert_bookmark() with -1 for the
position. DnD will come next.
>>>>>>> 1.5045
Fri Feb 27 21:42:28 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_relayout):

1
ChangeLog.pre-2-6
View File

@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford <jrb@redhat.com>
For now, use gtk_file_system_insert_bookmark() with -1 for the
position. DnD will come next.
>>>>>>> 1.5045
Fri Feb 27 21:42:28 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_relayout):

1
ChangeLog.pre-2-8
View File

@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford <jrb@redhat.com>
For now, use gtk_file_system_insert_bookmark() with -1 for the
position. DnD will come next.
>>>>>>> 1.5045
Fri Feb 27 21:42:28 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_relayout):