AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-05 16:20:10 +00:00
Code Issues Projects Releases Wiki Activity

Remove conflict markers

Browse Source
This commit is contained in:
Matthias Clasen 2005-04-29 14:45:36 +00:00
parent 7d2d8182b4
commit 3f9ade6436
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -136,7 +136,6 @@
Enter the "user-resized" state of the column only if a drag
actually changes the column width, not on any click.
>>>>>>> 1.6531
2005-04-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_paint): Allow setting background

1
ChangeLog.pre-2-10
View File

@ -136,7 +136,6 @@
Enter the "user-resized" state of the column only if a drag
actually changes the column width, not on any click.
>>>>>>> 1.6531
2005-04-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_paint): Allow setting background

1
ChangeLog.pre-2-8
View File

@ -136,7 +136,6 @@
Enter the "user-resized" state of the column only if a drag
actually changes the column width, not on any click.
>>>>>>> 1.6531
2005-04-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_paint): Allow setting background