File tree Expand file tree Collapse file tree 2 files changed +21
-22
lines changed Expand file tree Collapse file tree 2 files changed +21
-22
lines changed Original file line number Diff line number Diff line change
1
+ * .pbxproj - crlf - diff - merge
Original file line number Diff line number Diff line change 1
- # Mac OS X Finder and whatnot
1
+ # OS X
2
2
.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
13
16
xcuserdata
14
17
* .xcworkspace
15
18
16
- # Generated files
17
- VersionX-revision.h
18
-
19
-
20
- # build products
21
- build /
19
+ # built products
20
+ build
22
21
* .o
23
22
24
- # Other source repository archive directories (protects when importing)
23
+ # Other source repository archive directories
25
24
.hg
26
25
.svn
27
26
CVS
28
27
29
-
30
- # automatic backup files
31
- * ~.nib
28
+ # Automatic backup files
29
+ # ~.nib/
32
30
* .swp
33
31
* ~
34
32
* (Autosaved).rtfd /
35
33
Backup [ ]of [ ]* .pages /
36
- Backup [ ]of [ ]* .key /
34
+ Backup [ ]of [ ]* .key /
37
35
Backup [ ]of [ ]* .numbers /
You can’t perform that action at this time.
0 commit comments