]> git.eshelyaron.com Git - emacs.git/commit
Remove conflict marker and merged entries about re-generating config.in.
authorGlenn Morris <rgm@gnu.org>
Sat, 2 Feb 2008 04:47:40 +0000 (04:47 +0000)
committerGlenn Morris <rgm@gnu.org>
Sat, 2 Feb 2008 04:47:40 +0000 (04:47 +0000)
commit849eb485c750bbd95dc9d19648523a28ad0801f6
treef034e25388a12bf91c0abdbed0a2b3b107c4fcce
parent7e14d905634fb54fd5f26e6c51d3427e44e77fb8
Remove conflict marker and merged entries about re-generating config.in.
src/ChangeLog