[llvm-branch-commits] [lldb] r267997 - Updating branches/google/testing to r267754

[Eric Christopher via llvm-branch-commits]

Author: echristo
Date: Fri Apr 29 00:59:48 2016
New Revision: 267997

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

Added:
    lldb/branches/google/testing/   (props changed)
      - copied from r267754, lldb/trunk/

Propchange: lldb/branches/google/testing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 29 00:59:48 2016
@@ -0,0 +1,4 @@
+build
+intermediates
+llvm
+llvm-build

Propchange: lldb/branches/google/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 29 00:59:48 2016
@@ -0,0 +1,2 @@
+/lldb/branches/apple/python-GIL:156467-162159
+/lldb/branches/iohandler:198360-200250