diff --git a/ChangeLog b/ChangeLog index 2e3a3462a3..dba3318321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,7 +46,6 @@ Fri Oct 26 20:55:57 2001 Owen Taylor * gtk/gtk.def : added the remaining exported functions 2001-10-27 Anders Carlsson ->>>>>>> 1.2471 * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): Add note about width having to be greater than 0. This fixes diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2e3a3462a3..dba3318321 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -46,7 +46,6 @@ Fri Oct 26 20:55:57 2001 Owen Taylor * gtk/gtk.def : added the remaining exported functions 2001-10-27 Anders Carlsson ->>>>>>> 1.2471 * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): Add note about width having to be greater than 0. This fixes diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2e3a3462a3..dba3318321 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -46,7 +46,6 @@ Fri Oct 26 20:55:57 2001 Owen Taylor * gtk/gtk.def : added the remaining exported functions 2001-10-27 Anders Carlsson ->>>>>>> 1.2471 * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): Add note about width having to be greater than 0. This fixes diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2e3a3462a3..dba3318321 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -46,7 +46,6 @@ Fri Oct 26 20:55:57 2001 Owen Taylor * gtk/gtk.def : added the remaining exported functions 2001-10-27 Anders Carlsson ->>>>>>> 1.2471 * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): Add note about width having to be greater than 0. This fixes diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2e3a3462a3..dba3318321 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -46,7 +46,6 @@ Fri Oct 26 20:55:57 2001 Owen Taylor * gtk/gtk.def : added the remaining exported functions 2001-10-27 Anders Carlsson ->>>>>>> 1.2471 * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): Add note about width having to be greater than 0. This fixes diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2e3a3462a3..dba3318321 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -46,7 +46,6 @@ Fri Oct 26 20:55:57 2001 Owen Taylor * gtk/gtk.def : added the remaining exported functions 2001-10-27 Anders Carlsson ->>>>>>> 1.2471 * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): Add note about width having to be greater than 0. This fixes diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2e3a3462a3..dba3318321 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -46,7 +46,6 @@ Fri Oct 26 20:55:57 2001 Owen Taylor * gtk/gtk.def : added the remaining exported functions 2001-10-27 Anders Carlsson ->>>>>>> 1.2471 * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_fixed_width): Add note about width having to be greater than 0. This fixes