GIT: Added ignore of OS/X DS_Store files and made line endings consistent (from Jordi Guillaumes Pons)

This commit is contained in:
Mark Pizzolato 2014-01-23 05:11:18 -08:00
parent c64aabf51f
commit fcaced5393

87
.gitignore vendored
View file

@ -1,47 +1,48 @@
.git-commit-id .git-commit-id
#ignore thumbnails created by windows #ignore thumbnails created by windows
Thumbs.db Thumbs.db
#Ignore files built by Visual Studio #ignore Desktop Services Store created by OSX
*.obj .DS_Store
# VAX/vmb.exe is not a generated file and should be in the repository #Ignore files built by Visual Studio
!VAX/vmb.exe *.obj
*.exe # VAX/vmb.exe is not a generated file and should be in the repository
*.pdb !VAX/vmb.exe
*.user *.exe
*.aps *.pdb
*.pch *.user
*.vspscc *.aps
*_i.c *.pch
*_p.c *.vspscc
*.ncb *_i.c
*.suo *_p.c
*.tlb *.ncb
*.tlh *.suo
*.bak *.tlb
*.cache *.tlh
*.ilk *.bak
*.log *.cache
[Bb]in *.ilk
[Dd]ebug*/ *.log
*.lib [Bb]in
*.sbr [Dd]ebug*/
*.bak *.lib
obj/ *.sbr
[Rr]elease*/ *.bak
_ReSharper*/ obj/
[Tt]est[Rr]esult* [Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
*.o *.o
*~ *~
*# *#
BIN/ BIN/
ipch/ ipch/
# We only care about specific files in the Visual Studio Projects # We only care about specific files in the Visual Studio Projects
# folder. Things which are there on the fly to support debugging # folder. Things which are there on the fly to support debugging
# or other things we don't want git to manage. # or other things we don't want git to manage.
!Visual Studio Projects/*.vcproj !Visual Studio Projects/*.vcproj
!Visual Studio Projects/*.sln !Visual Studio Projects/*.sln
!Visual Studio Projects/0ReadMe_Projects.txt !Visual Studio Projects/0ReadMe_Projects.txt
Visual Studio Projects/* Visual Studio Projects/*