Fix merge glitches in 2 ChangeLog files.
treef26f002d2c4732fdf69fe6c88c22c9c5bb2860f0
-rw-r--r-- 596 .dir-locals.el
-rw-r--r-- 4617 .gitignore
-rw-r--r-- 932 BUGS
-rw-r--r-- 12652 CONTRIBUTE
-rw-r--r-- 35147 COPYING
-rw-r--r-- 467238 ChangeLog
-rw-r--r-- 2799 GNUmakefile
-rw-r--r-- 30357 INSTALL
-rw-r--r-- 3342 INSTALL.REPO
-rw-r--r-- 41677 Makefile.in
-rw-r--r-- 5684 README
drwxr-xr-x - admin
-rwxr-xr-x 6894 autogen.sh
drwxr-xr-x - build-aux
-rw-r--r-- 13573 config.bat
-rw-r--r-- 178991 configure.ac
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - leim
drwxr-xr-x - lib-src
drwxr-xr-x - lib
drwxr-xr-x - lisp
drwxr-xr-x - lwlib
drwxr-xr-x - m4
-rwxr-xr-x 17457 make-dist
drwxr-xr-x - msdos
drwxr-xr-x - nextstep
drwxr-xr-x - nt
drwxr-xr-x - oldXMenu
drwxr-xr-x - src
drwxr-xr-x - test