diff options
| author | Paul Eggert | 2011-04-09 20:24:44 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-09 20:24:44 -0700 |
| commit | da0e53381fb37a43706634ada4b3e04ba4e5e366 (patch) | |
| tree | 5c488ea2fc01099ee0a722dca963dedd8537966a /src/ChangeLog | |
| parent | 3fc4037235381288defecf6166450a99d65cd69a (diff) | |
| parent | a32d40405d31edd2ce4349b95277306554fb54a4 (diff) | |
| download | emacs-da0e53381fb37a43706634ada4b3e04ba4e5e366.tar.gz emacs-da0e53381fb37a43706634ada4b3e04ba4e5e366.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3bd4fc1f4c0..5ed6826d429 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -80,6 +80,10 @@ | |||
| 80 | 80 | ||
| 81 | 2011-04-09 Chong Yidong <cyd@stupidchicken.com> | 81 | 2011-04-09 Chong Yidong <cyd@stupidchicken.com> |
| 82 | 82 | ||
| 83 | * image.c (Fimagemagick_types): Doc fix, and comment cleanup. | ||
| 84 | |||
| 85 | 2011-04-09 Chong Yidong <cyd@stupidchicken.com> | ||
| 86 | |||
| 83 | * ftfont.c (get_adstyle_property, ftfont_pattern_entity): Use | 87 | * ftfont.c (get_adstyle_property, ftfont_pattern_entity): Use |
| 84 | unsigned char, to match FcChar8 type definition. | 88 | unsigned char, to match FcChar8 type definition. |
| 85 | 89 | ||