*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 253b9e223fb60cdc89f4545b0f69061b2b0cab8e..8fc758f41c07db5102124f4a4b856cfebc450746 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -530,7 +530,6 @@ Sun Aug 12 10:39:12 2001  Owen Taylor  <otaylor@redhat.com>
        * Makefile.am (EXTRA_DIST): Fix problem with trying to
        dist files from intl/, which is no longer there.
 
->>>>>>> 1.2213
 2001-08-11  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 253b9e223fb60cdc89f4545b0f69061b2b0cab8e..8fc758f41c07db5102124f4a4b856cfebc450746 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -530,7 +530,6 @@ Sun Aug 12 10:39:12 2001  Owen Taylor  <otaylor@redhat.com>
        * Makefile.am (EXTRA_DIST): Fix problem with trying to
        dist files from intl/, which is no longer there.
 
->>>>>>> 1.2213
 2001-08-11  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 253b9e223fb60cdc89f4545b0f69061b2b0cab8e..8fc758f41c07db5102124f4a4b856cfebc450746 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -530,7 +530,6 @@ Sun Aug 12 10:39:12 2001  Owen Taylor  <otaylor@redhat.com>
        * Makefile.am (EXTRA_DIST): Fix problem with trying to
        dist files from intl/, which is no longer there.
 
->>>>>>> 1.2213
 2001-08-11  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 253b9e223fb60cdc89f4545b0f69061b2b0cab8e..8fc758f41c07db5102124f4a4b856cfebc450746 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -530,7 +530,6 @@ Sun Aug 12 10:39:12 2001  Owen Taylor  <otaylor@redhat.com>
        * Makefile.am (EXTRA_DIST): Fix problem with trying to
        dist files from intl/, which is no longer there.
 
->>>>>>> 1.2213
 2001-08-11  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 253b9e223fb60cdc89f4545b0f69061b2b0cab8e..8fc758f41c07db5102124f4a4b856cfebc450746 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -530,7 +530,6 @@ Sun Aug 12 10:39:12 2001  Owen Taylor  <otaylor@redhat.com>
        * Makefile.am (EXTRA_DIST): Fix problem with trying to
        dist files from intl/, which is no longer there.
 
->>>>>>> 1.2213
 2001-08-11  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 253b9e223fb60cdc89f4545b0f69061b2b0cab8e..8fc758f41c07db5102124f4a4b856cfebc450746 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -530,7 +530,6 @@ Sun Aug 12 10:39:12 2001  Owen Taylor  <otaylor@redhat.com>
        * Makefile.am (EXTRA_DIST): Fix problem with trying to
        dist files from intl/, which is no longer there.
 
->>>>>>> 1.2213
 2001-08-11  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 253b9e223fb60cdc89f4545b0f69061b2b0cab8e..8fc758f41c07db5102124f4a4b856cfebc450746 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -530,7 +530,6 @@ Sun Aug 12 10:39:12 2001  Owen Taylor  <otaylor@redhat.com>
        * Makefile.am (EXTRA_DIST): Fix problem with trying to
        dist files from intl/, which is no longer there.
 
->>>>>>> 1.2213
 2001-08-11  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c,

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index bc6b35981de3c589ae0b7a83288e80259753cbb7..c1ddbcb1f1e283a83a4baa04ceccdb534a8399bd 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,3 @@
-Tue Aug 28 20:10:31 2001  Matthias Clasen  <matthiasc@poet.de>
-
 Tue Aug 28 20:03:43 2001  Matthias Clasen  <matthiasc@poet.de>
 
        * test-loaders.c (test_loader): Catch errors at close time.