Mercurial > emacs
changeset 74388:48a1a163455a
*** empty log message ***
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Mon, 04 Dec 2006 01:02:12 +0000 |
| parents | d8c2dc308e9c |
| children | b2c46d13e98d |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 04 00:33:19 2006 +0000 +++ b/lisp/ChangeLog Mon Dec 04 01:02:12 2006 +0000 @@ -95,12 +95,7 @@ * descr-text.el (describe-char-unicodedata-file): Fix typo in docstring. -<<<<<<< ChangeLog ->>>>>>> 1.10388 -2006-12-01 Vinicius Jose Latorre <viniciusjl@ig.com.br> -======= 2006-12-01 Ben North <ben@redfrontdoor.org> ->>>>>>> 1.10392 * paren.el: Fix the highlight overlay extension when the user types a sequence of char very fast just before the open parenthesis.