summaryrefslogtreecommitdiff
path: root/ChangeLog.pre-2-2
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2001-08-28 19:08:53 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2001-08-28 19:08:53 +0000
commita0c65ec21be2467929447de9bbd7f57173ef0ff9 (patch)
tree65d42ff57b7e67462ff759f6b3c2462e1bf0bead /ChangeLog.pre-2-2
parent61223e291d90e317c104b0625d76bcf6bf2b26f5 (diff)
downloadgtk+-a0c65ec21be2467929447de9bbd7f57173ef0ff9.tar.gz
*** empty log message ***
Diffstat (limited to 'ChangeLog.pre-2-2')
-rw-r--r--ChangeLog.pre-2-21
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 253b9e223f..8fc758f41c 100644
--- 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,