[llvm-branch-commits] [cfe-branch] r310564 - Updating branches/google/stable to r310337

[Daniel Jasper via llvm-branch-commits]

Author: djasper
Date: Thu Aug 10 02:41:23 2017
New Revision: 310564

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

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

Propchange: cfe/branches/google/stable/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 10 02:41:23 2017
@@ -0,0 +1,3 @@
+configure.out
+cscope.files
+cscope.out

Propchange: cfe/branches/google/stable/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 10 02:41:23 2017
@@ -0,0 +1,3 @@
+/cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk/test:170344
+/cfe/trunk/test/SemaTemplate:126920