merge from trunk
[emacs.git] / etc / .gitignore
blob8e12acbee0c1aa5d6574033b6d61e7f6b2ae9bd5
1 DOC
2 icons/