Conflicts:
	Global/OSX.gitignore
This commit is contained in:
Ali Servet Donmez
2012-08-27 12:40:37 +02:00
4 changed files with 23 additions and 0 deletions

View File

@@ -1,10 +1,24 @@
.DS_Store
.AppleDouble
.LSOverride
Icon
# Thumbnails
._*
# Files that might appear on external disk
.Spotlight-V100
.Trashes