AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

remove conflict marker

Browse Source
This commit is contained in:
Kristian Rietveld 2006-04-26 12:22:01 +00:00
parent bc3db2f3ac
commit 3eac42f2d4
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -136,7 +136,6 @@ Tue Apr 25 10:25:28 2006 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkprinter.c: * gtk/gtkprinter.c:
Don't ref the backend since the backend owns the printer. Don't ref the backend since the backend owns the printer.
>>>>>>> 1.7779
2006-04-24 Alexander Larsson <alexl@redhat.com> 2006-04-24 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers): * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers):

1
ChangeLog.pre-2-10
View File

@ -136,7 +136,6 @@ Tue Apr 25 10:25:28 2006 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkprinter.c: * gtk/gtkprinter.c:
Don't ref the backend since the backend owns the printer. Don't ref the backend since the backend owns the printer.
>>>>>>> 1.7779
2006-04-24 Alexander Larsson <alexl@redhat.com> 2006-04-24 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers): * gtk/gtkpagesetupunixdialog.c (update_combo_sensitivity_from_printers):