diff --git a/ChangeLog b/ChangeLog index e3218278db..a5427d52f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e3218278db..a5427d52f5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor 2000-11-15 Havoc Pennington ->>>>>>> 1.1532 * gtk/gtktextview.c (changed_handler): offset redraw rect by xoffset in addition to yoffset, so horizontal scrolling doesn't break redraws