aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2011-03-13 18:36:47 -0400
committerChong Yidong2011-03-13 18:36:47 -0400
commit46dcfee46cb241a0f8e34da679ca8b42e8ee8d46 (patch)
treefa7d3b5e82b953ee505cec1614c6d7057138f79d /ChangeLog
parentad22b7f7c16aa6c26df6ec1e1c192dde2e1b0cce (diff)
downloademacs-46dcfee46cb241a0f8e34da679ca8b42e8ee8d46.tar.gz
emacs-46dcfee46cb241a0f8e34da679ca8b42e8ee8d46.zip
Backport 2011-03-06T01:42:13Z!rgm@gnu.org from trunk.
* configure.in (FREETYPE_LIBS): Actually set it to something. * configure.in: Don't zero-out FONTCONFIG_CFLAGS and FONTCONFIG_LIBS when building with XFT (doing so is incorrect, as Emacs directly uses fontconfig, and breaks building when using a strict linker).
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b3dcc3af64..b45615d4317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
12011-03-13 Glenn Morris <rgm@gnu.org>
2
3 * configure.in (FREETYPE_LIBS): Actually set it to something.
4
52011-03-13 Miles Bader <miles@gnu.org>
6
7 * configure.in: Don't zero-out FONTCONFIG_CFLAGS and
8 FONTCONFIG_LIBS when building with XFT (doing so is incorrect, as
9 Emacs directly uses fontconfig, and breaks building when using a
10 strict linker).
11
12011-03-07 Chong Yidong <cyd@stupidchicken.com> 122011-03-07 Chong Yidong <cyd@stupidchicken.com>
2 13
3 * Version 23.3 released. 14 * Version 23.3 released.