HomePhabricator

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

Authored by jkorous on Dec 6 2018, 1:29 AM.

Description

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

  1. Conflicts:
  2. include/clang/Basic/Attr.td

apple-llvm-split-commit: 68571b25294390ce33f70901890a7f8054458cb1
apple-llvm-split-dir: clang/

Details

Committed
jkorousDec 6 2018, 1:29 AM
Parents
rGac410c00f3e8: Merge clang-tools-extra: [clangd] Fix a typo in TUSchedulerTests
Branches
Unknown
Tags
Unknown