[llvm-branch-commits] [cfe-branch] r209361 - Updating branches/google/stable to r209252

[Nick Lewycky]

Author: nicholas
Date: Wed May 21 19:40:03 2014
New Revision: 209361

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

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

Propchange: cfe/branches/google/stable/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 21 19:40:03 2014
@@ -0,0 +1,3 @@
+configure.out
+cscope.files
+cscope.out

Propchange: cfe/branches/google/stable/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed May 21 19:40:03 2014
@@ -0,0 +1,3 @@
+/cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk/test:170344
+/cfe/trunk/test/SemaTemplate:126920