aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2013-12-05 09:18:38 +0000
committerKostya Serebryany <kcc@gcc.gnu.org>2013-12-05 09:18:38 +0000
commitdf77f0e4ec043bc4fa155efbd5c1c74ce73d2b50 (patch)
tree20d85354103063e38b162a6a90b7ae51fb4b6104 /libsanitizer/MERGE
parent649d196dbd78a119786f204d36b7c5d4dcb3a949 (diff)
downloadgcc-df77f0e4ec043bc4fa155efbd5c1c74ce73d2b50.zip
gcc-df77f0e4ec043bc4fa155efbd5c1c74ce73d2b50.tar.gz
gcc-df77f0e4ec043bc4fa155efbd5c1c74ce73d2b50.tar.bz2
libsanitizer merge from upstream r196090
From-SVN: r205695
Diffstat (limited to 'libsanitizer/MERGE')
-rw-r--r--libsanitizer/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/libsanitizer/MERGE b/libsanitizer/MERGE
index 0431b14..084cd2d 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.