diff options
| author | Chong Yidong | 2012-05-05 12:32:58 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-05-05 12:32:58 +0800 |
| commit | eceeb5fca618f3bc0743c2388148dd758229c7c9 (patch) | |
| tree | 314434b14014363326ec7ce2868c3b86af4d97c3 /src/ChangeLog | |
| parent | 248da2f497e8865e8bebb0e3adb9184ab36e95f2 (diff) | |
| parent | be4e7c155b6922dd6105f4be57164210c3441f37 (diff) | |
| download | emacs-eceeb5fca618f3bc0743c2388148dd758229c7c9.tar.gz emacs-eceeb5fca618f3bc0743c2388148dd758229c7c9.zip | |
Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org
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 8063c8d8166..a4d7bb64919 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-05-05 Jim Meyering <meyering@redhat.com> | ||
| 2 | |||
| 3 | * w32font.c (fill_in_logfont): NUL-terminate a string (Bug#11372). | ||
| 4 | |||
| 1 | 2012-05-04 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2012-05-04 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * data.c (PUT_ERROR): New macro. | 7 | * data.c (PUT_ERROR): New macro. |