Mercurial > emacs
changeset 46659:e86dc5373cac
*** empty log message ***
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 24 Jul 2002 11:05:01 +0000 |
| parents | ab6078ae4045 |
| children | 5bf90f1bc620 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jul 24 03:59:52 2002 +0000 +++ b/lisp/ChangeLog Wed Jul 24 11:05:01 2002 +0000 @@ -161,7 +161,6 @@ (reftex-parse-bibtex-entry): Use `reftex-syntax-table-for-bib'. (reftex-with-special-syntax-for-bib): new macro. -<<<<<<< ChangeLog 2002-07-21 Richard M. Stallman <rms@gnu.org> * international/ucs-tables.el (ucs-quail-activate): @@ -170,10 +169,7 @@ * bindings.el (last-buffer): Use buffer-list with frame arg. Create *scratch* if no other choice exists. Fix bugs. -2002-07-21 Kai Gro,b_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> -======= 2002-07-21 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> ->>>>>>> 1.4146 * net/tramp.el: Bump version to 2.0.2. (tramp-methods): Rename methods invoking "ssh1" or "ssh2" to