Skip to content

Commit c4deeb4

Browse files
author
dd2284
committed
modify gitignore
1 parent ebe53b1 commit c4deeb4

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pbxproj -crlf -diff -merge

.gitignore

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
1-
# Mac OS X Finder and whatnot
1+
# OS X
22
.DS_Store
3-
4-
# XCode (and ancestors) per-user config (very noisy, and not relevant)
5-
*.mode1
6-
*.mode1v3
7-
*.mode2v3
8-
*.perspective
9-
*.perspectivev3
10-
*.pbxuser
11-
12-
#for Xcode 4
3+
.DS_store
4+
profile
5+
6+
# XCode
7+
*.mode*
8+
*.perspective*
9+
*.pbxuser*
10+
*tmproj
11+
External/GHUnit/*
12+
PLBlocks.framework/*
13+
*.pyc
14+
15+
# for Xcode 4
1316
xcuserdata
1417
*.xcworkspace
1518

16-
# Generated files
17-
VersionX-revision.h
18-
19-
20-
# build products
21-
build/
19+
# built products
20+
build
2221
*.o
2322

24-
# Other source repository archive directories (protects when importing)
23+
# Other source repository archive directories
2524
.hg
2625
.svn
2726
CVS
2827

29-
30-
# automatic backup files
31-
*~.nib
28+
# Automatic backup files
29+
#~.nib/
3230
*.swp
3331
*~
3432
*(Autosaved).rtfd/
3533
Backup[ ]of[ ]*.pages/
36-
Backup[ ]of[ ]*.key/
34+
Backup[ ]of[ ]*.key/
3735
Backup[ ]of[ ]*.numbers/

0 commit comments

Comments
 (0)