HomePhabricator

Merge branch 'master' of http://llvm.org/git/clang into upstream-with-swift

Authored by friss on Nov 10 2015, 5:32 PM.

Description

Merge branch 'master' of http://llvm.org/git/clang into upstream-with-swift

Conflicts:
include/clang/Sema/Sema.h
lib/Sema/SemaDecl.cpp

apple-llvm-split-commit: 980b0acdbb9f0455f686387ef9ce15f934691e1f
apple-llvm-split-dir: clang/