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

fixup conflict indicators

Browse Source
This commit is contained in:
Tim Janik
2004-10-05 17:31:10 +00:00
parent b9a31bbcb2
commit dc5a39b136
4 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -135,7 +135,6 @@ Tue Oct 5 17:06:26 2004 Tim Janik <timj@gtk.org>
call layout_clear_attributes, and also delegate calls to dependent call layout_clear_attributes, and also delegate calls to dependent
cell layouts. (#154191, Martyn Russell) cell layouts. (#154191, Martyn Russell)
>>>>>>> 1.5869
2004-10-01 Matthias Clasen <mclasen@redhat.com> 2004-10-01 Matthias Clasen <mclasen@redhat.com>
* modules/input/iminuktitut.c: Fix the spelling of Inuktitut * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

1
ChangeLog.pre-2-10
View File

@ -135,7 +135,6 @@ Tue Oct 5 17:06:26 2004 Tim Janik <timj@gtk.org>
call layout_clear_attributes, and also delegate calls to dependent call layout_clear_attributes, and also delegate calls to dependent
cell layouts. (#154191, Martyn Russell) cell layouts. (#154191, Martyn Russell)
>>>>>>> 1.5869
2004-10-01 Matthias Clasen <mclasen@redhat.com> 2004-10-01 Matthias Clasen <mclasen@redhat.com>
* modules/input/iminuktitut.c: Fix the spelling of Inuktitut * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

1
ChangeLog.pre-2-6
View File

@ -135,7 +135,6 @@ Tue Oct 5 17:06:26 2004 Tim Janik <timj@gtk.org>
call layout_clear_attributes, and also delegate calls to dependent call layout_clear_attributes, and also delegate calls to dependent
cell layouts. (#154191, Martyn Russell) cell layouts. (#154191, Martyn Russell)
>>>>>>> 1.5869
2004-10-01 Matthias Clasen <mclasen@redhat.com> 2004-10-01 Matthias Clasen <mclasen@redhat.com>
* modules/input/iminuktitut.c: Fix the spelling of Inuktitut * modules/input/iminuktitut.c: Fix the spelling of Inuktitut

1
ChangeLog.pre-2-8
View File

@ -135,7 +135,6 @@ Tue Oct 5 17:06:26 2004 Tim Janik <timj@gtk.org>
call layout_clear_attributes, and also delegate calls to dependent call layout_clear_attributes, and also delegate calls to dependent
cell layouts. (#154191, Martyn Russell) cell layouts. (#154191, Martyn Russell)
>>>>>>> 1.5869
2004-10-01 Matthias Clasen <mclasen@redhat.com> 2004-10-01 Matthias Clasen <mclasen@redhat.com>
* modules/input/iminuktitut.c: Fix the spelling of Inuktitut * modules/input/iminuktitut.c: Fix the spelling of Inuktitut