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

Remove conflict indicators

Browse Source
This commit is contained in:
Owen Taylor
2002-06-16 03:59:29 +00:00
parent 9e783527b3
commit 387cbde678
6 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
Fixes #79190.
>>>>>>> 1.3338.2.117
Sat Jun 1 10:38:24 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
@@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor <otaylor@redhat.com>
* NEWS: Updated.
>>>>>>> 1.3338.2.79
2002-05-23 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in: Use correct path to the loaders and immodules
@@ -387,7 +385,6 @@ Wed May 22 12:29:20 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_init): remove
GTK_RESIZE_QUEUE setting.
>>>>>>> 1.3338.2.67
Tue May 21 16:46:15 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch):

3
ChangeLog.pre-2-10
View File

@@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
Fixes #79190.
>>>>>>> 1.3338.2.117
Sat Jun 1 10:38:24 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
@@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor <otaylor@redhat.com>
* NEWS: Updated.
>>>>>>> 1.3338.2.79
2002-05-23 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in: Use correct path to the loaders and immodules
@@ -387,7 +385,6 @@ Wed May 22 12:29:20 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_init): remove
GTK_RESIZE_QUEUE setting.
>>>>>>> 1.3338.2.67
Tue May 21 16:46:15 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch):

3
ChangeLog.pre-2-2
View File

@@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
Fixes #79190.
>>>>>>> 1.3338.2.117
Sat Jun 1 10:38:24 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
@@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor <otaylor@redhat.com>
* NEWS: Updated.
>>>>>>> 1.3338.2.79
2002-05-23 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in: Use correct path to the loaders and immodules
@@ -387,7 +385,6 @@ Wed May 22 12:29:20 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_init): remove
GTK_RESIZE_QUEUE setting.
>>>>>>> 1.3338.2.67
Tue May 21 16:46:15 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch):

3
ChangeLog.pre-2-4
View File

@@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
Fixes #79190.
>>>>>>> 1.3338.2.117
Sat Jun 1 10:38:24 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
@@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor <otaylor@redhat.com>
* NEWS: Updated.
>>>>>>> 1.3338.2.79
2002-05-23 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in: Use correct path to the loaders and immodules
@@ -387,7 +385,6 @@ Wed May 22 12:29:20 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_init): remove
GTK_RESIZE_QUEUE setting.
>>>>>>> 1.3338.2.67
Tue May 21 16:46:15 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch):

3
ChangeLog.pre-2-6
View File

@@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
Fixes #79190.
>>>>>>> 1.3338.2.117
Sat Jun 1 10:38:24 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
@@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor <otaylor@redhat.com>
* NEWS: Updated.
>>>>>>> 1.3338.2.79
2002-05-23 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in: Use correct path to the loaders and immodules
@@ -387,7 +385,6 @@ Wed May 22 12:29:20 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_init): remove
GTK_RESIZE_QUEUE setting.
>>>>>>> 1.3338.2.67
Tue May 21 16:46:15 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch):

3
ChangeLog.pre-2-8
View File

@@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
Fixes #79190.
>>>>>>> 1.3338.2.117
Sat Jun 1 10:38:24 2002 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
@@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor <otaylor@redhat.com>
* NEWS: Updated.
>>>>>>> 1.3338.2.79
2002-05-23 Tor Lillqvist <tml@iki.fi>
* gtk-zip.sh.in: Use correct path to the loaders and immodules
@@ -387,7 +385,6 @@ Wed May 22 12:29:20 2002 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_init): remove
GTK_RESIZE_QUEUE setting.
>>>>>>> 1.3338.2.67
Tue May 21 16:46:15 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch):