From 387cbde678e93aee9faac50c78586cdae4f57d7c Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 16 Jun 2002 03:59:29 +0000 Subject: [PATCH] Remove conflict indicators --- ChangeLog | 3 --- ChangeLog.pre-2-10 | 3 --- ChangeLog.pre-2-2 | 3 --- ChangeLog.pre-2-4 | 3 --- ChangeLog.pre-2-6 | 3 --- ChangeLog.pre-2-8 | 3 --- 6 files changed, 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 751ee6a834..6688b60002 100644 --- a/ChangeLog +++ b/ChangeLog @@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor * 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 * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): @@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor * NEWS: Updated. ->>>>>>> 1.3338.2.79 2002-05-23 Tor Lillqvist * 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 * 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 * gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 751ee6a834..6688b60002 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor * 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 * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): @@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor * NEWS: Updated. ->>>>>>> 1.3338.2.79 2002-05-23 Tor Lillqvist * 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 * 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 * gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 751ee6a834..6688b60002 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor * 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 * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): @@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor * NEWS: Updated. ->>>>>>> 1.3338.2.79 2002-05-23 Tor Lillqvist * 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 * 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 * gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 751ee6a834..6688b60002 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor * 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 * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): @@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor * NEWS: Updated. ->>>>>>> 1.3338.2.79 2002-05-23 Tor Lillqvist * 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 * 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 * gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 751ee6a834..6688b60002 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor * 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 * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): @@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor * NEWS: Updated. ->>>>>>> 1.3338.2.79 2002-05-23 Tor Lillqvist * 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 * 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 * gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 751ee6a834..6688b60002 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -269,7 +269,6 @@ Tue Jun 4 17:39:34 2002 Owen Taylor * 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 * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): @@ -371,7 +370,6 @@ Thu May 23 17:19:16 2002 Owen Taylor * NEWS: Updated. ->>>>>>> 1.3338.2.79 2002-05-23 Tor Lillqvist * 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 * 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 * gdk/x11/gdkmain-x11.c (gdk_internal_connection_watch):