diff options
| author | Juanma Barranquero | 2008-03-10 22:53:10 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-03-10 22:53:10 +0000 |
| commit | 6feaf11097e6243a9882b7f7db37fb960a61e42b (patch) | |
| tree | fcc6de4426b73f9a37d31f0591e8e7dfa133d81e | |
| parent | 1109332fdf96f41bc125db91267d24d654b11ef7 (diff) | |
| download | emacs-6feaf11097e6243a9882b7f7db37fb960a61e42b.tar.gz emacs-6feaf11097e6243a9882b7f7db37fb960a61e42b.zip | |
*** empty log message ***
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f86c68f21e9..2eb9c12ed2c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | * progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in | 65 | * progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in |
| 66 | doc-string, "c-old-LEN" -> "c-old-END". | 66 | doc-string, "c-old-LEN" -> "c-old-END". |
| 67 | 67 | ||
| 68 | >>>>>>> 1.11049.2.667 | ||
| 69 | 2008-02-29 Glenn Morris <rgm@gnu.org> | 68 | 2008-02-29 Glenn Morris <rgm@gnu.org> |
| 70 | 69 | ||
| 71 | * allout.el (allout-topic-encryption-bullet) | 70 | * allout.el (allout-topic-encryption-bullet) |