Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dorota Czaplejewicz
gtk
Commits
77ae64b8
Commit
77ae64b8
authored
Feb 21, 2006
by
Sven Neumann
Browse files
removed leftover CVS conflict markers
parent
5dcae734
Changes
2
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
77ae64b8
...
...
@@ -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
...
...
ChangeLog.pre-2-10
View file @
77ae64b8
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment