ChangeLog merge fix
treeec897739884f405690c405ce0d8b6dcc305648ae
-rw-r--r-- 615 .dir-locals.el
-rw-r--r-- 168 .gitignore
-rw-r--r-- 932 BUGS
-rw-r--r-- 35147 COPYING
-rw-r--r-- 336893 ChangeLog
-rw-r--r-- 2642 GNUmakefile
-rw-r--r-- 34868 INSTALL
-rw-r--r-- 3712 INSTALL.BZR
-rw-r--r-- 34656 Makefile.in
-rw-r--r-- 5527 README
drwxr-xr-x - admin
-rwxr-xr-x 5482 autogen.sh
drwxr-xr-x - autogen
drwxr-xr-x - build-aux
-rw-r--r-- 13595 config.bat
-rw-r--r-- 126870 configure.in
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - info
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 17360 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