Mercurial > emacs
changeset 111946:f3180cee7797
ChangeLog merge fix.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 13 Dec 2010 09:18:55 -0800 |
| parents | c00190a8c8ef |
| children | 00848c75219e |
| files | doc/emacs/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Mon Dec 13 10:27:36 2010 -0500 +++ b/doc/emacs/ChangeLog Mon Dec 13 09:18:55 2010 -0800 @@ -26,7 +26,6 @@ (Windows Startup): New node. Move the stuff about the current directory from "Windows HOME". -2010-12-13 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> 2010-11-27 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> * maintaining.texi (VC With A Locking VCS, VC Directory Commands):