HomePhabricator

Merge remote-tracking branch 'llvm.org/master' into upstream-with-swift
fbfe708f8ac8Unpublished

Authored by mzolotukhin on Jan 16 2018, 9:25 AM.

Unpublished Commit ยท Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge remote-tracking branch 'llvm.org/master' into upstream-with-swift

Conflicts:
tools/libclang/libclang.exports
unittests/libclang/LibclangTest.cpp

apple-llvm-split-commit: e3e28d2c1aa9119ae9546c880bafff724a64375c
apple-llvm-split-dir: clang/