Mercurial > emacs
changeset 111164:547e7258d492
Merge changes from emacs-23 branch.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 24 Oct 2010 17:37:38 -0400 |
| parents | b8d9a3e4de08 (diff) bf6806de6892 (current diff) |
| children | 6e6f966c3473 |
| files | src/ChangeLog |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Oct 24 17:36:09 2010 -0400 +++ b/src/ChangeLog Sun Oct 24 17:37:38 2010 -0400 @@ -2,7 +2,7 @@ * xterm.c (x_connection_closed): Kill Emacs unconditionally. -2010-10-22 Eli Zaretskii <eliz@gnu.org> +2010-10-24 Eli Zaretskii <eliz@gnu.org> * frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.