diff options
| author | Glenn Morris | 2007-12-07 04:33:41 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-12-07 04:33:41 +0000 |
| commit | e74d83ee49cac55f1833d8fba8d735a31a99daa4 (patch) | |
| tree | 0df6971f8f21417c722a5655979a13d38d9ccd11 | |
| parent | 7e5be5e349ec9f1dfe8c3b86926e0c1b63b047a3 (diff) | |
| download | emacs-e74d83ee49cac55f1833d8fba8d735a31a99daa4.tar.gz emacs-e74d83ee49cac55f1833d8fba8d735a31a99daa4.zip | |
Tidying.
| -rw-r--r-- | lisp/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c6e769ba04..a18c1835fd2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * textmodes/ispell.el (ispell-process-line): | 6 | * textmodes/ispell.el (ispell-process-line): |
| 7 | * progmodes/vhdl-mode.el (vhdl-template-modify): | 7 | * progmodes/vhdl-mode.el (vhdl-template-modify): |
| 8 | * progmodes/idlw-shell.el (idlwave-shell-send-command) | 8 | * progmodes/idlw-shell.el (idlwave-shell-send-command) |
| 9 | (idlwave-shell-display-line) | 9 | (idlwave-shell-display-line): |
| 10 | * progmodes/ada-xref.el (ada-find-file, ada-get-all-references) | 10 | * progmodes/ada-xref.el (ada-find-file, ada-get-all-references) |
| 11 | (ada-xref-find-in-modified-ali, ada-find-in-src-path): | 11 | (ada-xref-find-in-modified-ali, ada-find-in-src-path): |
| 12 | * net/trampver.el (x): | 12 | * net/trampver.el (x): |
| @@ -87,7 +87,6 @@ | |||
| 87 | event of a verification failure. | 87 | event of a verification failure. |
| 88 | 88 | ||
| 89 | 2007-12-05 Reiner Steib <Reiner.Steib@gmx.de> | 89 | 2007-12-05 Reiner Steib <Reiner.Steib@gmx.de> |
| 90 | >>>>>>> 1.12380 | ||
| 91 | 90 | ||
| 92 | * net/tls.el (tls-program): Provide more custom choices from | 91 | * net/tls.el (tls-program): Provide more custom choices from |
| 93 | `tls-checktrust'. Refer to `tls-checktrust' in doc string. | 92 | `tls-checktrust'. Refer to `tls-checktrust' in doc string. |