HomePhabricator

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

Authored by anemet on Dec 20 2018, 9:07 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:
include/clang/AST/PrettyPrinter.h

apple-llvm-split-commit: 174179aa806b71423828ce6b1ba1e4c69f431f92
apple-llvm-split-dir: clang/