[llvm-branch-commits] [lldb] r270673 - Merging r265134:

[Mohit K. Bhakkad via llvm-branch-commits]

Author: mohit.bhakkad
Date: Wed May 25 00:59:50 2016
New Revision: 270673

URL: http://llvm.org/viewvc/llvm-project?rev=270673&view=rev
Log:
Merging r265134:
------------------------------------------------------------------------

Modified:
    lldb/branches/release_38/   (props changed)

Propchange: lldb/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 00:59:50 2016
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:257691-257692,257926,258485,258621,258684-258685,258758,258761,258919,258967,259188,260072,260362,262819,264030
+/lldb/trunk:257691-257692,257926,258485,258621,258684-258685,258758,258761,258919,258967,259188,260072,260362,262819,264030,265134