Manually merge master into master-next.

Browse Source

Fixed merge conflicts in:
- lib/ClangImporter/ClangImporter.cpp
- lib/ClangImporter/ImportType.cpp
- lib/Frontend/CompilerInvocation.cpp
- lib/Serialization/ModuleFile.cpp
- lib/TBDGen/TBDGen.cpp

...

This commit is contained in:

Varun Gandhi

2020-07-15 21:36:13 -07:00

parent 172d63b73d 29a3d08c5a

commit ee10198e9a

529 changed files with 33526 additions and 12539 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

2154

lib/Serialization/ModuleFile.cpp

File diff suppressed because it is too large Load Diff