diff options
| author | Eli Zaretskii | 2010-02-06 12:50:45 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-02-06 12:50:45 -0500 |
| commit | 9a0d7cf1aaffb76aaf4a94f5124795dd9d7c8aed (patch) | |
| tree | cd0e293690d927c44d2eea4a7453f6aba3ce5344 /src/ChangeLog | |
| parent | e5f95dc5a35a7ff655527b08d73c05cd3f6f1dc7 (diff) | |
| parent | 953d248c55173853e6cffb01a5348703faf4e990 (diff) | |
| download | emacs-9a0d7cf1aaffb76aaf4a94f5124795dd9d7c8aed.tar.gz emacs-9a0d7cf1aaffb76aaf4a94f5124795dd9d7c8aed.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f1f4aa24b35..4837d8ecb06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-02-06 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * charset.c (load_charset_map_from_file) | ||
| 4 | (load_charset_map_from_vector): Fix last change to use SAFE_ALLOCA | ||
| 5 | instead of xmalloc (Bug#5526). Suggested by Vivek Dasmohapatra. | ||
| 6 | |||
| 1 | 2010-02-05 Chong Yidong <cyd@stupidchicken.com> | 7 | 2010-02-05 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 8 | ||
| 3 | * charset.c (load_charset_map_from_file): Allocate large | 9 | * charset.c (load_charset_map_from_file): Allocate large |