diff options
| author | Joakim Verona | 2013-09-12 15:35:32 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-12 15:35:32 +0200 |
| commit | 9e85e5849326ef68f54e7d21abc2bf898c158a37 (patch) | |
| tree | da3acdff09fa48e8e28c34a1ad36f4fe92ae767e /src/ChangeLog | |
| parent | 09af8568ed7255dd764a8c4ca050776ced66c366 (diff) | |
| parent | 15c6d837a554bd128c1d5ef7b46fd05d6eba52ab (diff) | |
| download | emacs-9e85e5849326ef68f54e7d21abc2bf898c158a37.tar.gz emacs-9e85e5849326ef68f54e7d21abc2bf898c158a37.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 069a9885b4c..b4d1c2b67df 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-09-12 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * charset.c (char_charset): Document an exception for char-charset. | ||
| 4 | |||
| 1 | 2013-09-12 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2013-09-12 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | * xterm.h (x_display_info): New field last_user_time... | 7 | * xterm.h (x_display_info): New field last_user_time... |