log lisp/ChangeLog @ 112234:84917bd2a94e

age author description
Fri, 14 Jan 2011 14:55:35 -0500 Stefan Monnier * lisp/hexl.el (hexl-mode-old-*): Remove.
Fri, 14 Jan 2011 13:10:15 -0500 Stefan Monnier * lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.
Fri, 14 Jan 2011 09:42:40 -0800 Glenn Morris ChangeLog merge fixes.