This is an automated email from the git hooks/post-receive script.
unknown user pushed a change to branch master in repository clang.
from 14192764c3 Fix a merge conflict that was inadvertently introduced in r3 [...] new 4204da92f0 Factor out common code for diagnosing missing template arguments. new 0e3eb07cb5 Revert addition of 'concept' to diagnostics in r330890.
The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: include/clang/Basic/DiagnosticSemaKinds.td | 2 -- include/clang/Sema/Sema.h | 2 ++ lib/Sema/SemaDecl.cpp | 8 +------- lib/Sema/SemaExpr.cpp | 4 +--- lib/Sema/SemaExprMember.cpp | 10 +++------- lib/Sema/SemaTemplate.cpp | 16 +++++++++++----- test/SemaCXX/cxx1y-variable-templates_in_class.cpp | 1 - test/SemaCXX/cxx1y-variable-templates_top_level.cpp | 6 +++--- test/SemaTemplate/alias-templates.cpp | 6 ++++-- 9 files changed, 25 insertions(+), 30 deletions(-)