[Emacs-commit] emacs/lisp international/mule-cmds.el ChangeLog

[Kai Großjohann]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Kai Großjohann <address@hidden> 03/06/29 06:37:01

Modified files:
        lisp/international: mule-cmds.el 
        lisp           : ChangeLog 

Log message:
        (set-display-table-and-terminal-coding-system): Remove CVS
        conflict markers and some code.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/international/mule-cmds.el.diff?tr1=1.236&tr2=1.237&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.5246&tr2=1.5247&r1=text&r2=text