From: Ali Servet Donmez <asd@pittle.org>
Date: Mon, 27 Aug 2012 10:40:37 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/github/gitignore
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F403%2Fhead;p=gitignore.git

Merge branch 'master' of https://github.com/github/gitignore

Conflicts:
	Global/OSX.gitignore
---

964de38e9b75e3c716496180001e1765ca3ecd9d
diff --cc Global/OSX.gitignore
index ef10493f,bdc30421..c5efd178
--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
@@@ -1,10 -1,11 +1,24 @@@
 -.DS_Store
 -.AppleDouble
 -Icon
 -
 -
 -# Thumbnails
 -._*
 -
 -# Files that might appear on external disk
 -.Spotlight-V100
 -.Trashes
 +.DS_Store
++
++.AppleDouble
++
 +.LSOverride
++
 +Icon
 +
++
++
++
++
 +# Thumbnails
++
 +._*
 +
++
++
 +# Files that might appear on external disk
++
 +.Spotlight-V100
++
 +.Trashes
++