Michael Gottesman 8d00a6cb59 Merge remote-tracking branch 'origin/master' into master-next ...

Conflicts:
	stdlib/public/SDK/GameplayKit/CMakeLists.txt
	test/DebugInfo/bound-namealiastype.swift
	test/DebugInfo/structs.swift
	test/IRGen/c_globals.swift
	test/SourceKit/DocSupport/doc_clang_module.swift
	test/SourceKit/Indexing/index_with_clang_module.swift
	utils/update-checkout

2016-06-25 01:13:50 -07:00

3.1 KiB

Raw Blame History

View Raw