X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=ChangeLog.pre-2-10;h=f04136d2efcc62d6dbcb0b427b9c28b9f296f84e;hb=9af9ab160867b693b3ec556cd5da010f19981d23;hp=5ee68ad7d26ee81b7ae21d0df997a553fea75290;hpb=189a6cc5dbd2d4f60bfe879a318797e0609a436e;p=~andy%2Fgtk

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5ee68ad7d..f04136d2e 100644
--- 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.