[Emacs-commit] emacs/lisp ChangeLog ChangeLog.10

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Miles Bader <address@hidden>    03/10/08 01:10:43

Modified files:
        lisp           : ChangeLog ChangeLog.10 

Log message:
        Resolve CVS conflicts

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.5451&tr2=1.5452&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.10.diff?tr1=1.1&tr2=1.2&r1=text&r2=text