[llvm-branch-commits] [lldb] r289141 - Updating branches/google/testing to r288672

[Eric Christopher via llvm-branch-commits]

Author: echristo
Date: Thu Dec  8 16:22:11 2016
New Revision: 289141

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

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

Propchange: lldb/branches/google/testing/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec  8 16:22:11 2016
@@ -0,0 +1,4 @@
+build
+intermediates
+llvm
+llvm-build

Propchange: lldb/branches/google/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec  8 16:22:11 2016
@@ -0,0 +1,2 @@
+/lldb/branches/apple/python-GIL:156467-162159
+/lldb/branches/iohandler:198360-200250