Tex Riddell 6663dac50f Merge branch 'master' into user/texr/integrate-master ... # Conflicts: # lib/HLSL/DxilContainerAssembler.cpp # lib/HLSL/DxilGenerationPass.cpp # lib/HLSL/DxilLinker.cpp # lib/HLSL/DxilModule.cpp # lib/HLSL/DxilOperations.cpp # lib/HLSL/DxilTypeSystem.cpp # lib/HLSL/DxilValidation.cpp # lib/HLSL/HLMatrixLowerPass.cpp # lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp		2018-06-22 12:05:49 -07:00
..
dxc	Merge branch 'master' into user/texr/integrate-master	2018-06-22 12:05:49 -07:00
llvm	Merge branch 'master' into user/texr/integrate-master	2018-06-22 12:05:49 -07:00
llvm-c	[linux-port] Introduce Windows "adapter" headers (#1314)	2018-06-17 11:31:21 -04:00