diff options
| author | Chong Yidong | 2011-03-19 14:49:31 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-03-19 14:49:31 -0400 |
| commit | b14e3e21ec6702d27257a1400681fc36ee10282f (patch) | |
| tree | b57ce354a1ca3637a4cad3fe1fcc6f42bfc2efa5 /src/ChangeLog | |
| parent | 4525ce3eb56a1f4b7c50eac9217854bbd170f660 (diff) | |
| parent | 20f5695598d3137257e24802479d003ea82eb5f9 (diff) | |
| download | emacs-b14e3e21ec6702d27257a1400681fc36ee10282f.tar.gz emacs-b14e3e21ec6702d27257a1400681fc36ee10282f.zip | |
Merge changes from emacs-23 branch
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 8cbcaf4afbc..5aee468d933 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2011-03-19 Juanma Barranquero <lekktu@gmail.com> | 1 | 2011-03-19 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * xfaces.c (Fx_load_color_file): | ||
| 4 | Read color file from absolute filename (bug#8250). | ||
| 5 | |||
| 6 | 2011-03-19 Juanma Barranquero <lekktu@gmail.com> | ||
| 7 | |||
| 3 | * makefile.w32-in: Update dependencies. | 8 | * makefile.w32-in: Update dependencies. |
| 4 | 9 | ||
| 5 | 2011-03-17 Eli Zaretskii <eliz@gnu.org> | 10 | 2011-03-17 Eli Zaretskii <eliz@gnu.org> |