[llvm-branch-commits] [lldb] r269823 - Updating branches/google/stable to r267754

[Eric Christopher via llvm-branch-commits]

Author: echristo
Date: Tue May 17 14:56:25 2016
New Revision: 269823

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

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

Propchange: lldb/branches/google/stable/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue May 17 14:56:25 2016
@@ -0,0 +1,4 @@
+build
+intermediates
+llvm
+llvm-build

Propchange: lldb/branches/google/stable/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 17 14:56:25 2016
@@ -0,0 +1,2 @@
+/lldb/branches/apple/python-GIL:156467-162159
+/lldb/branches/iohandler:198360-200250