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

remove conflict markers

Browse Source
This commit is contained in:
Havoc Pennington 2001-10-23 16:17:15 +00:00
parent 13a24b1b36
commit dceeec3521
7 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld <kristian@planet.nl>
it instead of "search-dialog" (when getting/setting the search dialog
widget).
>>>>>>> 1.2409
2001-10-05 Jakub Steiner <jimmac@ximian.com>
* gtk/stock-icons/stock_broken_image.png: broken images icon

1
ChangeLog.pre-2-0
View File

@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld <kristian@planet.nl>
it instead of "search-dialog" (when getting/setting the search dialog
widget).
>>>>>>> 1.2409
2001-10-05 Jakub Steiner <jimmac@ximian.com>
* gtk/stock-icons/stock_broken_image.png: broken images icon

1
ChangeLog.pre-2-10
View File

@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld <kristian@planet.nl>
it instead of "search-dialog" (when getting/setting the search dialog
widget).
>>>>>>> 1.2409
2001-10-05 Jakub Steiner <jimmac@ximian.com>
* gtk/stock-icons/stock_broken_image.png: broken images icon

1
ChangeLog.pre-2-2
View File

@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld <kristian@planet.nl>
it instead of "search-dialog" (when getting/setting the search dialog
widget).
>>>>>>> 1.2409
2001-10-05 Jakub Steiner <jimmac@ximian.com>
* gtk/stock-icons/stock_broken_image.png: broken images icon

1
ChangeLog.pre-2-4
View File

@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld <kristian@planet.nl>
it instead of "search-dialog" (when getting/setting the search dialog
widget).
>>>>>>> 1.2409
2001-10-05 Jakub Steiner <jimmac@ximian.com>
* gtk/stock-icons/stock_broken_image.png: broken images icon

1
ChangeLog.pre-2-6
View File

@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld <kristian@planet.nl>
it instead of "search-dialog" (when getting/setting the search dialog
widget).
>>>>>>> 1.2409
2001-10-05 Jakub Steiner <jimmac@ximian.com>
* gtk/stock-icons/stock_broken_image.png: broken images icon

1
ChangeLog.pre-2-8
View File

@ -567,7 +567,6 @@ Fri Oct 5 19:06:07 2001 Kristian Rietveld <kristian@planet.nl>
it instead of "search-dialog" (when getting/setting the search dialog
widget).
>>>>>>> 1.2409
2001-10-05 Jakub Steiner <jimmac@ximian.com>
* gtk/stock-icons/stock_broken_image.png: broken images icon