diff options
| author | Joakim Verona | 2013-09-12 18:16:57 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-12 18:16:57 +0200 |
| commit | 98658022ba2ea2473882851839433647240655ad (patch) | |
| tree | 2d7dfe0c93ac9db855f6f15f280bccf1620fb552 /src/ChangeLog | |
| parent | 3525167e356666b1d0ffc9c18d6e429174168deb (diff) | |
| parent | 347ae3e1436e9705d21c140b29b8e9c818ed86ab (diff) | |
| download | emacs-98658022ba2ea2473882851839433647240655ad.tar.gz emacs-98658022ba2ea2473882851839433647240655ad.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 b4d1c2b67df..f08395ae24f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-09-12 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * lisp.mk (lisp): Add w32-common-fns.elc. | ||
| 4 | |||
| 1 | 2013-09-12 Xue Fuqiao <xfq.free@gmail.com> | 5 | 2013-09-12 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 6 | ||
| 3 | * charset.c (char_charset): Document an exception for char-charset. | 7 | * charset.c (char_charset): Document an exception for char-charset. |