Fix versioning to avoid changing the soname!

[~andy/gtk] / ChangeLog.pre-2-10

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5ee68ad7d26ee81b7ae21d0df997a553fea75290..f04136d2efcc62d6dbcb0b427b9c28b9f296f84e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,19 @@
-2002-05-05  Matthias Clasen  <maclas@gmx.de>
+Mon May  6 12:17:14 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Fix versioning to avoid changing the
+       soname!
+
+       [ merge from stable ]
+
+       * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
+
+       * m4macros/gtk-2.0.m4: save CFLAGS/LIBS properly when
+       compiling "what went wrong" test case. (#79329)
+
+       * m4macros/gtk-2.0.m4: Remove reference to editing
+       pkg-config script. (From Jim Gettys)
+
+02-05-05  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Bump version to 2.1.0, binary, interface age 0.