[llvm-branch-commits] [cfe-branch] r298143 - Updating branches/google/testing to r297704

[Eric Christopher via llvm-branch-commits]

Author: echristo
Date: Fri Mar 17 16:56:06 2017
New Revision: 298143

URL: http://llvm.org/viewvc/llvm-project?rev=298143&view=rev
Log:
Updating branches/google/testing to r297704

Added:
    cfe/branches/google/testing/   (props changed)
      - copied from r297704, cfe/trunk/

Propchange: cfe/branches/google/testing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 17 16:56:06 2017
@@ -0,0 +1,3 @@
+configure.out
+cscope.files
+cscope.out

Propchange: cfe/branches/google/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 17 16:56:06 2017
@@ -0,0 +1,3 @@
+/cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk/test:170344
+/cfe/trunk/test/SemaTemplate:126920