Mercurial > emacs
comparison nt/ChangeLog @ 91450:afc545f3960e
Remove conflict marker and merged entries about re-generating config.in.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 02 Feb 2008 04:47:40 +0000 |
parents | 0e2ade584fbb |
children | 8e789aeed552 |
comparison
equal
deleted
inserted
replaced
91449:2122a7a1fdaa | 91450:afc545f3960e |
---|