Mercurial > emacs
diff doc/emacs/ChangeLog @ 106981:e3fcbe16deae
merge conflict
author | Mark A. Hershberger <mhershberger@intrahealth.org> |
---|---|
date | Sun, 24 Jan 2010 23:52:26 -0500 |
parents | 66e0d01014c6 e394375cf1da |
children | 456aad5db2ee |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Tue Jan 19 14:39:22 2010 -0500 +++ b/doc/emacs/ChangeLog Sun Jan 24 23:52:26 2010 -0500 @@ -1,8 +1,12 @@ -2010-01-19 Mark A. Hershberger <mah@everybody.org> +2010-01-24 Mark A. Hershberger <mah@everybody.org> * programs.texi (Other C Commands): Replace reference to obsolete c-subword-mode. +2010-01-21 Glenn Morris <rgm@gnu.org> + + * trouble.texi (Bugs): Fix PROBLEMS keybinding. + 2010-01-12 Glenn Morris <rgm@gnu.org> * trouble.texi (Checklist): Use bug-gnu-emacs rather than