AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

ack, remove conflict marker

Browse Source
This commit is contained in:
Manish Singh 2002-02-18 20:32:58 +00:00
parent a3b1cd22c4
commit 78c6308a01
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

@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor <otaylor@redhat.com>
stuck prelighting combine some common code for button release stuck prelighting combine some common code for button release
and pressing Escape. and pressing Escape.
>>>>>>> 1.3038
Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments) * gtk/gtkclist.c (adjust_adjustments)

1
ChangeLog.pre-2-0
View File

@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor <otaylor@redhat.com>
stuck prelighting combine some common code for button release stuck prelighting combine some common code for button release
and pressing Escape. and pressing Escape.
>>>>>>> 1.3038
Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments) * gtk/gtkclist.c (adjust_adjustments)

1
ChangeLog.pre-2-10
View File

@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor <otaylor@redhat.com>
stuck prelighting combine some common code for button release stuck prelighting combine some common code for button release
and pressing Escape. and pressing Escape.
>>>>>>> 1.3038
Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments) * gtk/gtkclist.c (adjust_adjustments)

1
ChangeLog.pre-2-2
View File

@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor <otaylor@redhat.com>
stuck prelighting combine some common code for button release stuck prelighting combine some common code for button release
and pressing Escape. and pressing Escape.
>>>>>>> 1.3038
Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments) * gtk/gtkclist.c (adjust_adjustments)

1
ChangeLog.pre-2-4
View File

@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor <otaylor@redhat.com>
stuck prelighting combine some common code for button release stuck prelighting combine some common code for button release
and pressing Escape. and pressing Escape.
>>>>>>> 1.3038
Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments) * gtk/gtkclist.c (adjust_adjustments)

1
ChangeLog.pre-2-6
View File

@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor <otaylor@redhat.com>
stuck prelighting combine some common code for button release stuck prelighting combine some common code for button release
and pressing Escape. and pressing Escape.
>>>>>>> 1.3038
Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments) * gtk/gtkclist.c (adjust_adjustments)

1
ChangeLog.pre-2-8
View File

@ -11,7 +11,6 @@ Mon Feb 18 14:40:22 2002 Owen Taylor <otaylor@redhat.com>
stuck prelighting combine some common code for button release stuck prelighting combine some common code for button release
and pressing Escape. and pressing Escape.
>>>>>>> 1.3038
Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com> Mon Feb 18 14:17:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (adjust_adjustments) * gtk/gtkclist.c (adjust_adjustments)