diff options
| author | Eli Zaretskii | 2010-01-02 05:22:05 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-02 05:22:05 -0500 |
| commit | a179af9bd20b2e9968506003937a152c1cbb5d9e (patch) | |
| tree | 2e903858b7fd9cd1efda2bd38c4ac9b20a0e867f /src/ChangeLog | |
| parent | 3b8fb4b39271ee1abaa725fbda501e7f10a708c1 (diff) | |
| parent | ab507311880d1b971a6bfad2676d92548041f63f (diff) | |
| download | emacs-a179af9bd20b2e9968506003937a152c1cbb5d9e.tar.gz emacs-a179af9bd20b2e9968506003937a152c1cbb5d9e.zip | |
Merge from upstream.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 73000341f68..d6e7f2c9791 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-01-01 Chong Yidong <cyd@stupidchicken.com> | 1 | 2010-01-01 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * nsterm.m (ns_get_color): Fix buffer overflow (Bug#4763). | ||
| 4 | |||
| 3 | * lread.c (syms_of_lread): Make it clearer that these are the | 5 | * lread.c (syms_of_lread): Make it clearer that these are the |
| 4 | names of loaded files (Bug#5068). | 6 | names of loaded files (Bug#5068). |
| 5 | 7 | ||