[llvm-branch-commits] [cfe-branch] r299156 - Updating branches/google/stable to r298696

[Eric Christopher via llvm-branch-commits]

Author: echristo
Date: Thu Mar 30 21:19:39 2017
New Revision: 299156

URL: http://llvm.org/viewvc/llvm-project?rev=299156&view=rev
Log:
Updating branches/google/stable to r298696

Added:
    cfe/branches/google/stable/   (props changed)
      - copied from r298696, cfe/trunk/

Propchange: cfe/branches/google/stable/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 30 21:19:39 2017
@@ -0,0 +1,3 @@
+configure.out
+cscope.files
+cscope.out

Propchange: cfe/branches/google/stable/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 30 21:19:39 2017
@@ -0,0 +1,3 @@
+/cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk/test:170344
+/cfe/trunk/test/SemaTemplate:126920