callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill stray conflict line.

Browse Source
This commit is contained in:
Robert Brady
2000-11-16 00:47:38 +00:00
parent fe682268d1
commit c087b64c77
7 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com> 2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by * gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws break redraws

1
ChangeLog.pre-2-0
View File

@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com> 2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by * gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws break redraws

1
ChangeLog.pre-2-10
View File

@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com> 2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by * gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws break redraws

1
ChangeLog.pre-2-2
View File

@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com> 2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by * gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws break redraws

1
ChangeLog.pre-2-4
View File

@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com> 2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by * gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws break redraws

1
ChangeLog.pre-2-6
View File

@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com> 2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by * gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws break redraws

1
ChangeLog.pre-2-8
View File

@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000 Owen Taylor <otaylor@redhat.com>
2000-11-15 Havoc Pennington <hp@redhat.com> 2000-11-15 Havoc Pennington <hp@redhat.com>
>>>>>>> 1.1532
* gtk/gtktextview.c (changed_handler): offset redraw rect by * gtk/gtktextview.c (changed_handler): offset redraw rect by
xoffset in addition to yoffset, so horizontal scrolling doesn't xoffset in addition to yoffset, so horizontal scrolling doesn't
break redraws break redraws