josh 22a49414e8 Fix merge conflicts (Toolchain, SwiftPMWorkspace, SwiftLanguageServer)

2018-12-07 13:39:43 +09:00

..

BuildSystem.swift

[build-system] Fold ExternalWorkspace into BuildSystem

2018-12-03 22:54:35 -08:00

BuildSystemList.swift

[build-system] Rename BuildSettingsProviderList -> BuildSystemList

2018-12-03 23:05:35 -08:00

CompilationDatabase.swift

[compdb] Log only once per query on failure

2018-12-03 21:50:00 -08:00

CompilationDatabaseBuildSystem.swift

Merge pull request #31 from benlangmuir/build-system-cleanup1

2018-12-04 14:32:31 -08:00

FallbackBuildSystem.swift

[build-system] Rename FallbackBuildSettingsProvider -> FallbackBuildSystem

2018-12-03 23:02:20 -08:00

FileBuildSettings.swift

[build-system] Move FileBuildSettings to its own file NFC

2018-12-03 22:08:56 -08:00

Toolchain.swift

Fix merge conflicts (Toolchain, SwiftPMWorkspace, SwiftLanguageServer)

2018-12-07 13:39:43 +09:00

ToolchainRegistry.swift

[core] Allow overriding the default toolchain using env TOOLCHAINS on Darwin

2018-12-03 09:06:49 -08:00

XCToolchainPlist.swift

[core] Omit some unnecessary words from APIs being refactored

2018-12-01 20:42:47 -08:00