Fix cherry-pick conflict.
[emacs.git] / admin / 
tree0473c7c74be57aef1f0b351139d11bedc87d9872
drwxr-xr-x   ..
-rw-r--r-- 9674 CPP-DEFINES
-rw-r--r-- 69388 ChangeLog
-rw-r--r-- 8657 FOR-RELEASE
-rw-r--r-- 3808 MAINTAINERS
-rw-r--r-- 2144 README
-rw-r--r-- 35162 admin.el
-rw-r--r-- 2542 alloc-colors.c
-rwxr-xr-x 2323 build-configs
-rw-r--r-- 16110 bzrmerge.el
drwxr-xr-x - charsets
-rwxr-xr-x 8841 check-doc-strings
drwxr-xr-x - coccinelle
-rw-r--r-- 18672 cus-test.el
-rwxr-xr-x 1188 diff-tar-files
-rw-r--r-- 5155 find-gc.el
drwxr-xr-x - grammars
-rwxr-xr-x 4547 make-emacs
-rw-r--r-- 7111 make-tarball.txt
-rwxr-xr-x 3134 merge-gnulib
drwxr-xr-x - notes
drwxr-xr-x - nt
-rwxr-xr-x 9257 quick-install-emacs
drwxr-xr-x - unidata
-rwxr-xr-x 2355 update-copyright
-rwxr-xr-x 8758 update_autogen