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

Remove conflict markers

Browse Source
This commit is contained in:
Matthias Clasen
2005-03-15 14:58:52 +00:00
parent e5bf7ac0b3
commit 4ea52b4510
3 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -42,7 +42,6 @@
try to focus the default_widget if there is
none. (#169881, Thomas Leonard)
>>>>>>> 1.6286.2.112
2005-03-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaccelgroup.c (substitute_underscores): Remove

1
ChangeLog.pre-2-10
View File

@@ -42,7 +42,6 @@
try to focus the default_widget if there is
none. (#169881, Thomas Leonard)
>>>>>>> 1.6286.2.112
2005-03-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaccelgroup.c (substitute_underscores): Remove

1
ChangeLog.pre-2-8
View File

@@ -42,7 +42,6 @@
try to focus the default_widget if there is
none. (#169881, Thomas Leonard)
>>>>>>> 1.6286.2.112
2005-03-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaccelgroup.c (substitute_underscores): Remove