Merge from trunk after a lot of time.
[bpt/emacs.git] / etc / .gitignore
1 DOC
2 icons/