AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 14:00:09 +00:00
Code Issues Projects Releases Wiki Activity

Removed conflict markers from ChangeLog.

Browse Source
This commit is contained in:
Sven Neumann 2002-01-12 17:48:45 +00:00
parent aeceb39d47
commit 79dbfed158
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

@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik <timj@gtk.org>
* gtk/gtktreesortable.h : ditto.
* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
>>>>>>> 1.2791
2002-01-08 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather

1
ChangeLog.pre-2-0
View File

@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik <timj@gtk.org>
* gtk/gtktreesortable.h : ditto.
* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
>>>>>>> 1.2791
2002-01-08 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather

1
ChangeLog.pre-2-10
View File

@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik <timj@gtk.org>
* gtk/gtktreesortable.h : ditto.
* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
>>>>>>> 1.2791
2002-01-08 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather

1
ChangeLog.pre-2-2
View File

@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik <timj@gtk.org>
* gtk/gtktreesortable.h : ditto.
* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
>>>>>>> 1.2791
2002-01-08 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather

1
ChangeLog.pre-2-4
View File

@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik <timj@gtk.org>
* gtk/gtktreesortable.h : ditto.
* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
>>>>>>> 1.2791
2002-01-08 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather

1
ChangeLog.pre-2-6
View File

@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik <timj@gtk.org>
* gtk/gtktreesortable.h : ditto.
* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
>>>>>>> 1.2791
2002-01-08 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather

1
ChangeLog.pre-2-8
View File

@ -223,7 +223,6 @@ Wed Jan 9 11:23:39 2002 Tim Janik <timj@gtk.org>
* gtk/gtktreesortable.h : ditto.
* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
>>>>>>> 1.2791
2002-01-08 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather