diff options
| author | Glenn Morris | 2010-12-13 09:18:55 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-12-13 09:18:55 -0800 |
| commit | e6df29f90e195fcdb9350985db69f6aed8952fa7 (patch) | |
| tree | ea62ab9488c3d3a956c67b48eeb3b3f5232c3c03 | |
| parent | f49d1f52b2e368ef67dcfececd426de958548f4e (diff) | |
| download | emacs-e6df29f90e195fcdb9350985db69f6aed8952fa7.tar.gz emacs-e6df29f90e195fcdb9350985db69f6aed8952fa7.zip | |
ChangeLog merge fix.
| -rw-r--r-- | doc/emacs/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index d300ed84062..062f6f4ad87 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | (Windows Startup): New node. Move the stuff about the current | 26 | (Windows Startup): New node. Move the stuff about the current |
| 27 | directory from "Windows HOME". | 27 | directory from "Windows HOME". |
| 28 | 28 | ||
| 29 | 2010-12-13 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> | ||
| 30 | 2010-11-27 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> | 29 | 2010-11-27 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> |
| 31 | 30 | ||
| 32 | * maintaining.texi (VC With A Locking VCS, VC Directory Commands): | 31 | * maintaining.texi (VC With A Locking VCS, VC Directory Commands): |