[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Kenichi Handa]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.4148 emacs/lisp/ChangeLog:1.4149
*** emacs/lisp/ChangeLog:1.4148 Tue Jul 23 23:59:52 2002
--- emacs/lisp/ChangeLog        Wed Jul 24 07:05:01 2002
***************
*** 161,167 ****
        (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  <address@hidden>
  
        * international/ucs-tables.el (ucs-quail-activate):
--- 161,166 ----
***************
*** 170,179 ****
        * 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  <address@hidden>
- =======
  2002-07-21  Kai Gro,A_(Bjohann  <address@hidden>
- >>>>>>> 1.4146
  
        * net/tramp.el: Bump version to 2.0.2.
        (tramp-methods): Rename methods invoking "ssh1" or "ssh2" to
--- 169,175 ----