diff options
| author | Eli Zaretskii | 2012-10-20 18:17:25 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-20 18:17:25 +0200 |
| commit | 6d03e7beda333663080a64af902231342fd941cf (patch) | |
| tree | bd4521483ad70701e3dbf2c32e2910947bad5b53 /src/ChangeLog | |
| parent | 87c6b4e6bd7e023bd57c709bb6af59bca27bf4f6 (diff) | |
| parent | 83c85d8e2e6c1e1cb309f554555e1aebc1dcb44f (diff) | |
| download | emacs-6d03e7beda333663080a64af902231342fd941cf.tar.gz emacs-6d03e7beda333663080a64af902231342fd941cf.zip | |
Merge from trunk.
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 f61c2ccdb00..c81009928de 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-10-20 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * lread.c (Fload): Doc fix (Bug#12592). | ||
| 4 | |||
| 1 | 2012-10-19 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change) | 5 | 2012-10-19 Kazuhiro Ito <kzhr@d1.dion.ne.jp> (tiny change) |
| 2 | 6 | ||
| 3 | * font.c (Ffont_at): Fix previous change. | 7 | * font.c (Ffont_at): Fix previous change. |