Merge pull request #1546 from Coeur/patch-1

DerivedData and xcuserdata are folders; *.xcuserstate is always inside
This commit is contained in:
Brendan Forster 2016-01-27 15:27:31 +10:30
commit 352c903c34
3 changed files with 10 additions and 12 deletions

View File

@ -4,7 +4,7 @@
## Build generated ## Build generated
build/ build/
DerivedData DerivedData/
## Various settings ## Various settings
*.pbxuser *.pbxuser
@ -15,9 +15,9 @@ DerivedData
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata/
## Other ## Other
*.xccheckout
*.moved-aside *.moved-aside
*.xcuserstate *.xccheckout
*.xcscmblueprint

View File

@ -4,7 +4,7 @@
## Build generated ## Build generated
build/ build/
DerivedData DerivedData/
## Various settings ## Various settings
*.pbxuser *.pbxuser
@ -15,12 +15,11 @@ DerivedData
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata/
## Other ## Other
*.xccheckout
*.moved-aside *.moved-aside
*.xcuserstate *.xccheckout
*.xcscmblueprint *.xcscmblueprint
## Obj-C/Swift specific ## Obj-C/Swift specific

View File

@ -4,7 +4,7 @@
## Build generated ## Build generated
build/ build/
DerivedData DerivedData/
## Various settings ## Various settings
*.pbxuser *.pbxuser
@ -15,12 +15,11 @@ DerivedData
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata/
## Other ## Other
*.xccheckout
*.moved-aside *.moved-aside
*.xcuserstate *.xccheckout
*.xcscmblueprint *.xcscmblueprint
## Obj-C/Swift specific ## Obj-C/Swift specific