diff options
| author | Jan Djärv | 2013-01-11 02:22:49 +0100 |
|---|---|---|
| committer | Jan Djärv | 2013-01-11 02:22:49 +0100 |
| commit | 38693137f66848fa3e3fee5d0af8436e9fe7414b (patch) | |
| tree | beb987a9c405fe58cd40a66692f00e0816651fee /src/ChangeLog | |
| parent | 45b7bfdd5414ee4be86b10468afbcd493aacd5ef (diff) | |
| download | emacs-38693137f66848fa3e3fee5d0af8436e9fe7414b.tar.gz emacs-38693137f66848fa3e3fee5d0af8436e9fe7414b.zip | |
* gtkutil.c (xg_initialize): Backport from trunk.
Add ifdef HAVE_FREETYPE around x_last_font_name.
Fixes: debbugs:13403
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0ba5b2ccab2..8c16df2803d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-01-11 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * gtkutil.c (xg_initialize): Backport from trunk. | ||
| 4 | Add ifdef HAVE_FREETYPE around x_last_font_name (Bug#13403). | ||
| 5 | |||
| 1 | 2013-01-11 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-01-11 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Backport typo fix from trunk, for AIX (Bug#13408). | 8 | Backport typo fix from trunk, for AIX (Bug#13408). |