Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove conflict moarker

Browse Source
This commit is contained in:
Matt Wilson
2001-10-31 18:52:22 +00:00
parent e0094ea92e
commit 3cc89fb5ab
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

@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

1
ChangeLog.pre-2-0
View File

@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

1
ChangeLog.pre-2-10
View File

@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

1
ChangeLog.pre-2-2
View File

@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

1
ChangeLog.pre-2-4
View File

@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

1
ChangeLog.pre-2-6
View File

@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

1
ChangeLog.pre-2-8
View File

@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed