From df77f0e4ec043bc4fa155efbd5c1c74ce73d2b50 Mon Sep 17 00:00:00 2001
From: Kostya Serebryany <kcc@google.com>
Date: Thu, 5 Dec 2013 09:18:38 +0000
Subject: libsanitizer merge from upstream r196090

From-SVN: r205695
---
 libsanitizer/MERGE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libsanitizer/MERGE')

diff --git a/libsanitizer/MERGE b/libsanitizer/MERGE
index 0431b147a16..084cd2d4ee6 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-191666
+196090
 
 The first line of this file holds the svn revision number of the
 last merge done from the master library sources.
-- 
cgit v1.2.1