fixing ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f2505164e442af0cc1145ab47490f823d137a1a4..37d9dbf8b1480206ccf19c8cb3bedde6beee837e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
 
-       * gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
        function
        (gtk_tree_view_column_create_button): use g_signal_* instead of
        gtk_signal_*, hook up _mnemonic_activate callback
@@ -8,11 +8,11 @@ Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
        gtk_label_set_text_width_mnemonic instead of gtk_label_set_text
        (#69095)
 
-       * gtktreeview.c (gtk_tree_view_class_init): remove key bindings
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): remove key bindings
        for C-f and C-b, let treeview search use C-f (instead of C-s)
        (#61886)
 
-       * gtkrc.key.emacs: add some GtkTreeView bindings
+       * gtk/gtkrc.key.emacs: add some GtkTreeView bindings
 
 Tue Feb 19 20:56:32 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
@@ -195,7 +195,6 @@ Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
        * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, 
        examples/paned/Makefile: Make the paned example deprecation-clean.
 
->>>>>>> 1.3035
 2002-02-17  jacob berkman  <jacob@ximian.com>
 
        * Makefile.am: remove the packer example files as they don't exist

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f2505164e442af0cc1145ab47490f823d137a1a4..37d9dbf8b1480206ccf19c8cb3bedde6beee837e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,6 +1,6 @@
 Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
 
-       * gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
        function
        (gtk_tree_view_column_create_button): use g_signal_* instead of
        gtk_signal_*, hook up _mnemonic_activate callback
@@ -8,11 +8,11 @@ Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
        gtk_label_set_text_width_mnemonic instead of gtk_label_set_text
        (#69095)
 
-       * gtktreeview.c (gtk_tree_view_class_init): remove key bindings
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): remove key bindings
        for C-f and C-b, let treeview search use C-f (instead of C-s)
        (#61886)
 
-       * gtkrc.key.emacs: add some GtkTreeView bindings
+       * gtk/gtkrc.key.emacs: add some GtkTreeView bindings
 
 Tue Feb 19 20:56:32 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
@@ -195,7 +195,6 @@ Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
        * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, 
        examples/paned/Makefile: Make the paned example deprecation-clean.
 
->>>>>>> 1.3035
 2002-02-17  jacob berkman  <jacob@ximian.com>
 
        * Makefile.am: remove the packer example files as they don't exist

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f2505164e442af0cc1145ab47490f823d137a1a4..37d9dbf8b1480206ccf19c8cb3bedde6beee837e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,6 @@
 Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
 
-       * gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
        function
        (gtk_tree_view_column_create_button): use g_signal_* instead of
        gtk_signal_*, hook up _mnemonic_activate callback
@@ -8,11 +8,11 @@ Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
        gtk_label_set_text_width_mnemonic instead of gtk_label_set_text
        (#69095)
 
-       * gtktreeview.c (gtk_tree_view_class_init): remove key bindings
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): remove key bindings
        for C-f and C-b, let treeview search use C-f (instead of C-s)
        (#61886)
 
-       * gtkrc.key.emacs: add some GtkTreeView bindings
+       * gtk/gtkrc.key.emacs: add some GtkTreeView bindings
 
 Tue Feb 19 20:56:32 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
@@ -195,7 +195,6 @@ Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
        * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, 
        examples/paned/Makefile: Make the paned example deprecation-clean.
 
->>>>>>> 1.3035
 2002-02-17  jacob berkman  <jacob@ximian.com>
 
        * Makefile.am: remove the packer example files as they don't exist

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f2505164e442af0cc1145ab47490f823d137a1a4..37d9dbf8b1480206ccf19c8cb3bedde6beee837e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,6 +1,6 @@
 Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
 
-       * gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
        function
        (gtk_tree_view_column_create_button): use g_signal_* instead of
        gtk_signal_*, hook up _mnemonic_activate callback
@@ -8,11 +8,11 @@ Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
        gtk_label_set_text_width_mnemonic instead of gtk_label_set_text
        (#69095)
 
-       * gtktreeview.c (gtk_tree_view_class_init): remove key bindings
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): remove key bindings
        for C-f and C-b, let treeview search use C-f (instead of C-s)
        (#61886)
 
-       * gtkrc.key.emacs: add some GtkTreeView bindings
+       * gtk/gtkrc.key.emacs: add some GtkTreeView bindings
 
 Tue Feb 19 20:56:32 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
@@ -195,7 +195,6 @@ Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
        * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, 
        examples/paned/Makefile: Make the paned example deprecation-clean.
 
->>>>>>> 1.3035
 2002-02-17  jacob berkman  <jacob@ximian.com>
 
        * Makefile.am: remove the packer example files as they don't exist

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f2505164e442af0cc1145ab47490f823d137a1a4..37d9dbf8b1480206ccf19c8cb3bedde6beee837e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,6 @@
 Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
 
-       * gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
        function
        (gtk_tree_view_column_create_button): use g_signal_* instead of
        gtk_signal_*, hook up _mnemonic_activate callback
@@ -8,11 +8,11 @@ Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
        gtk_label_set_text_width_mnemonic instead of gtk_label_set_text
        (#69095)
 
-       * gtktreeview.c (gtk_tree_view_class_init): remove key bindings
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): remove key bindings
        for C-f and C-b, let treeview search use C-f (instead of C-s)
        (#61886)
 
-       * gtkrc.key.emacs: add some GtkTreeView bindings
+       * gtk/gtkrc.key.emacs: add some GtkTreeView bindings
 
 Tue Feb 19 20:56:32 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
@@ -195,7 +195,6 @@ Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
        * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, 
        examples/paned/Makefile: Make the paned example deprecation-clean.
 
->>>>>>> 1.3035
 2002-02-17  jacob berkman  <jacob@ximian.com>
 
        * Makefile.am: remove the packer example files as they don't exist

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f2505164e442af0cc1145ab47490f823d137a1a4..37d9dbf8b1480206ccf19c8cb3bedde6beee837e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,6 @@
 Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
 
-       * gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
        function
        (gtk_tree_view_column_create_button): use g_signal_* instead of
        gtk_signal_*, hook up _mnemonic_activate callback
@@ -8,11 +8,11 @@ Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
        gtk_label_set_text_width_mnemonic instead of gtk_label_set_text
        (#69095)
 
-       * gtktreeview.c (gtk_tree_view_class_init): remove key bindings
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): remove key bindings
        for C-f and C-b, let treeview search use C-f (instead of C-s)
        (#61886)
 
-       * gtkrc.key.emacs: add some GtkTreeView bindings
+       * gtk/gtkrc.key.emacs: add some GtkTreeView bindings
 
 Tue Feb 19 20:56:32 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
@@ -195,7 +195,6 @@ Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
        * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, 
        examples/paned/Makefile: Make the paned example deprecation-clean.
 
->>>>>>> 1.3035
 2002-02-17  jacob berkman  <jacob@ximian.com>
 
        * Makefile.am: remove the packer example files as they don't exist

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f2505164e442af0cc1145ab47490f823d137a1a4..37d9dbf8b1480206ccf19c8cb3bedde6beee837e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,6 @@
 Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
 
-       * gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_mnemonic_activate): new
        function
        (gtk_tree_view_column_create_button): use g_signal_* instead of
        gtk_signal_*, hook up _mnemonic_activate callback
@@ -8,11 +8,11 @@ Tue Feb 19 22:10:59 2002  Kristian Rietveld  <kris@gtk.org>
        gtk_label_set_text_width_mnemonic instead of gtk_label_set_text
        (#69095)
 
-       * gtktreeview.c (gtk_tree_view_class_init): remove key bindings
+       * gtk/gtktreeview.c (gtk_tree_view_class_init): remove key bindings
        for C-f and C-b, let treeview search use C-f (instead of C-s)
        (#61886)
 
-       * gtkrc.key.emacs: add some GtkTreeView bindings
+       * gtk/gtkrc.key.emacs: add some GtkTreeView bindings
 
 Tue Feb 19 20:56:32 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
@@ -195,7 +195,6 @@ Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
        * docs/tutorial/gtk-tut.sgml, examples/paned/paned.c, 
        examples/paned/Makefile: Make the paned example deprecation-clean.
 
->>>>>>> 1.3035
 2002-02-17  jacob berkman  <jacob@ximian.com>
 
        * Makefile.am: remove the packer example files as they don't exist