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

Remove conflict indicators

Browse Source
This commit is contained in:
Søren Sandmann Pedersen 2004-02-26 22:30:56 +00:00
parent dc0718bd7e
commit 9c12d8e463
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

@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com> Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality

1
ChangeLog.pre-2-10
View File

@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com> Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality

1
ChangeLog.pre-2-4
View File

@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com> Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality

1
ChangeLog.pre-2-6
View File

@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com> Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality

1
ChangeLog.pre-2-8
View File

@ -47,7 +47,6 @@ Thu Feb 26 22:19:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs. * gtk/gtkcombobox.c (gtk_combo_box_new_text): Improve the docs.
>>>>>>> 1.5032
Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com> Thu Feb 26 15:43:43 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality * gtk/gtkstyle.[ch]: Export insertion cursor drawing functionality