Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed leftover CVS conflict markers

Browse Source
This commit is contained in:
Sven Neumann
2006-02-21 08:49:47 +00:00
parent 5dcae734e5
commit 77ae64b8ab
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -101,7 +101,6 @@
* gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix
a cast.
>>>>>>> 1.7541
2006-02-17 Matthias Clasen <mclasen@redhat.com>
DND keynav support:
@@ -140,7 +139,6 @@
* gtk/gtkcolorbutton.c (gtk_color_button_[un]realize):
Remove unnecessary checks.
>>>>>>> 1.7533
2006-02-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working

2
ChangeLog.pre-2-10
View File

@@ -101,7 +101,6 @@
* gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix
a cast.
>>>>>>> 1.7541
2006-02-17 Matthias Clasen <mclasen@redhat.com>
DND keynav support:
@@ -140,7 +139,6 @@
* gtk/gtkcolorbutton.c (gtk_color_button_[un]realize):
Remove unnecessary checks.
>>>>>>> 1.7533
2006-02-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working