Don't try to use pkg-config when we didn't find it. (#62944, Eric Lemings)

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

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9a4d3894f5497aad6bc124f9f84800759c870df0..e7f97e788c433a294dd9b0a657c62185e0a7c403 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/gtk-2.0.m4: Don't try to use pkg-config
+       when we didn't find it. (#62944, Eric Lemings)
+
+       * m4macros/gtk-2.0.m4: Fix problem with spaces around =
+       sign in assignment. (#63209, Arkadiusz Miskiewicz)
+
+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+       the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Updates.
@@ -137,6 +150,7 @@
        * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
        changes
 
+>>>>>>> 1.2483
 Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed