diff options
| author | Juanma Barranquero <[email protected]> | 2006-12-04 01:02:12 +0000 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2006-12-04 01:02:12 +0000 |
| commit | 43dbe40498d873e530c821594e362d7c2c2dea99 (patch) | |
| tree | 29c2fce1816e677f3d5739251d6d095d2c324665 | |
| parent | a8d5f40f49e4dff1b44869ec3ca3ff454e67b275 (diff) | |
*** empty log message ***
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df8e9da260..0200860211 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -95,12 +95,7 @@ * descr-text.el (describe-char-unicodedata-file): Fix typo in docstring. -<<<<<<< ChangeLog ->>>>>>> 1.10388 -2006-12-01 Vinicius Jose Latorre <[email protected]> -======= 2006-12-01 Ben North <[email protected]> ->>>>>>> 1.10392 * paren.el: Fix the highlight overlay extension when the user types a sequence of char very fast just before the open parenthesis. |