[llvm-branch-commits] [compiler-rt-branch] r195667 - Merging r195643:

[Sergey Matveev]

Author: smatveev
Date: Mon Nov 25 11:39:55 2013
New Revision: 195667

URL: http://llvm.org/viewvc/llvm-project?rev=195667&view=rev
Log:
Merging r195643:
------------------------------------------------------------------------
r195643 | smatveev | 2013-11-25 18:30:37 +0400 (Mon, 25 Nov 2013) | 1 line

[lsan] Add a missing file.
------------------------------------------------------------------------

Added:
    compiler-rt/branches/release_34/lib/lsan/lsan_preinit.cc
      - copied unchanged from r195643, compiler-rt/trunk/lib/lsan/lsan_preinit.cc
Modified:
    compiler-rt/branches/release_34/   (props changed)

Propchange: compiler-rt/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 25 11:39:55 2013
@@ -1 +1 @@
-/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642
+/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643