Yonas Kolb 8d6a70bdd0 Merge branch 'master' into xcodeproj_5 ...

# Conflicts:
#	.circleci/config.yml
#	Sources/XcodeGenKit/PBXProjGenerator.swift
#	Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj
#	Tests/XcodeGenKitTests/ProjectFixtureTests.swift
#	Tests/XcodeGenKitTests/ProjectGeneratorTests.swift

2018-10-08 22:00:45 +11:00

..

GeneratorHelpers.swift

update to xcodeproj 6

2018-09-25 23:38:38 +10:00

ProjectFixtureTests.swift

Merge branch 'master' into xcodeproj_5

2018-10-08 22:00:45 +11:00

ProjectGeneratorTests.swift

Merge branch 'master' into xcodeproj_5

2018-10-08 22:00:45 +11:00

ProjectSpecTests.swift

upgrade to xcodeproj 5

2018-09-25 21:08:11 +10:00

SourceGeneratorTests.swift

swift_format

2018-10-01 13:19:29 +10:00

SpecLoadingTests.swift

Merge branch 'master' into xcodeproj_5

2018-10-08 22:00:45 +11:00

StringDiff.swift

make format_code

2018-03-03 09:21:16 +11:00

TestHelpers.swift

upgrade to xcodeproj 5

2018-09-25 21:08:11 +10:00