[llvm-branch-commits] [llvm-branch] r264838 - Updating branches/google/testing to r264688

[Eric Christopher via llvm-branch-commits]

Author: echristo
Date: Wed Mar 30 00:01:13 2016
New Revision: 264838

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

Added:
    llvm/branches/google/testing/   (props changed)
      - copied from r264688, llvm/trunk/

Propchange: llvm/branches/google/testing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 30 00:01:13 2016
@@ -0,0 +1,25 @@
+Debug
+Release
+Release-Asserts
+mklib
+Makefile.config
+config.log
+config.status
+cvs.out
+autom4te.cache
+configure.out
+LLVM-*
+_distcheckdir
+llvm.spec
+svn-commit.*
+*.patch
+*.patch.raw
+cscope.*
+Debug+Coverage-Asserts
+Release+Coverage-Asserts
+Debug+Coverage
+Release+Coverage
+Debug+Checks
+Debug+Asserts
+Release+Asserts
+build

Propchange: llvm/branches/google/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 30 00:01:13 2016
@@ -0,0 +1,3 @@
+/llvm/branches/Apple/Pertwee:110850,110961
+/llvm/branches/type-system-rewrite:133420-134817
+/llvm/trunk:155241