[llvm-branch-commits] [cfe-branch] r240080 - Updating branches/google/stable to r239765

[Nick Lewycky]

Author: nicholas
Date: Thu Jun 18 18:36:39 2015
New Revision: 240080

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

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

Propchange: cfe/branches/google/stable/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 18 18:36:39 2015
@@ -0,0 +1,3 @@
+configure.out
+cscope.files
+cscope.out

Propchange: cfe/branches/google/stable/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jun 18 18:36:39 2015
@@ -0,0 +1,3 @@
+/cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk/test:170344
+/cfe/trunk/test/SemaTemplate:126920