AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 19:00:08 +00:00
Code Issues Projects Releases Wiki Activity

remove conflict mark

Browse Source
This commit is contained in:
Matt Wilson 2001-10-25 15:17:57 +00:00
parent d8bd40f744
commit 2a3d5739ed
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

@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

1
ChangeLog.pre-2-0
View File

@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

1
ChangeLog.pre-2-10
View File

@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

1
ChangeLog.pre-2-2
View File

@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

1
ChangeLog.pre-2-4
View File

@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

1
ChangeLog.pre-2-6
View File

@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't

1
ChangeLog.pre-2-8
View File

@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld <kristian@planet.nl>
remove hack to strip off the bogus newline, since we killed the
bogus newline; fixes #61779
>>>>>>> 1.2451
2001-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_update_adjustments): don't