Merge remote-tracking branch 'origin/master' into quickhelp-xml

Browse Source

Conflicts:
	test/SourceKit/DocSupport/doc_clang_module.swift.response

...

This commit is contained in:

Maxwell Swadling

2017-04-19 19:52:16 -07:00

parent 569ef0302e 53305f1e58

commit d7949f03c8

418 changed files with 15225 additions and 5768 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5065

test/SourceKit/DocSupport/doc_clang_module.swift.response

File diff suppressed because it is too large Load Diff