Merge branch 'local-Makefile' into test-makefile-merge
treebcf00be7c52ba819c2cece3841527482be1daaaf
-rw-r--r-- 75 .dir-locals.el
-rw-r--r-- 75 .dir-settings.el
-rw-r--r-- 810 .gitignore
-rw-r--r-- 93 .gitmodules
drwxr-xr-x - BUGFIXING
drwxr-xr-x - EXPERIMENTAL
-rw-r--r-- 1455 Makefile
-rw-r--r-- 1138 README
-rw-r--r-- 1054 README_DIST
-rw-r--r-- 3522 README_GIT
-rw-r--r-- 11757 README_maintainer
drwxr-xr-x - UTILITIES
drwxr-xr-x - contrib
-rw-r--r-- 3104 default.mk
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - lisp
-rw-r--r-- 1007 request-assign-future.txt
-rw-r--r-- 2055 targets.mk
drwxr-xr-x - testing