Merge from emacs--rel--22

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0eff1e7d2044330f640ea0701c3b3283d93c3da3..f000a4e4516275f2eda57eb9a2e2af66f94aef02 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,19 +26,20 @@ _$*
 *.ln
 core
 # CVS default ignores end
+*.xdelta
+.DS_Store
+Makefile
+autom4te.cache
 bin
 boot.log
 boot.log.diff
 boot.log.old
-update.log
+config.cache
 config.log
 config.status
-config.cache
-Makefile
+data
 emacs*.tar.gz
 leim*.tar.gz
 lock
-*.xdelta
-autom4te.cache
 site-lisp
-data
\ No newline at end of file
+update.log