From: Glenn Morris <rgm@gnu.org>
Date: Wed, 25 Jun 2008 07:46:42 +0000 (+0000)
Subject: Revert re-ordering and removal of .DS_Store that occurred in unicode merge.
X-Git-Tag: emacs-pretest-23.0.90~4515
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e4b2828d946ec379d9d04353c18507c802ef2b6;p=emacs.git

Revert re-ordering and removal of .DS_Store that occurred in unicode merge.
---

diff --git a/.gitignore b/.gitignore
index 0eff1e7d204..f000a4e4516 100644
--- 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