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

[Kai Großjohann]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.5246 emacs/lisp/ChangeLog:1.5247
*** emacs/lisp/ChangeLog:1.5246 Fri Jun 27 16:19:21 2003
--- emacs/lisp/ChangeLog        Sun Jun 29 06:37:00 2003
***************
*** 1,3 ****
--- 1,9 ----
+ 2003-06-29  Kai Gro,A_(Bjohann  <address@hidden>
+ 
+       * international/mule-cmds.el
+       (set-display-table-and-terminal-coding-system): Remove CVS
+       conflict markers and some code.
+ 
  2003-06-27  Kai Gro,A_(Bjohann  <address@hidden>
  
        * international/mule-cmds.el (menu-bar-options-menu): Move