aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2013-02-13 10:46:01 +0000
committerKostya Serebryany <kcc@gcc.gnu.org>2013-02-13 10:46:01 +0000
commitb4ab7d34f5ee89e23f75cb25585bc851c7f713b3 (patch)
treec4504a71a4de65630ff00dd7aa8e062235fc5076 /libsanitizer/MERGE
parentbdcbe80c52f4cec942890eda8520d553edff998f (diff)
downloadgcc-b4ab7d34f5ee89e23f75cb25585bc851c7f713b3.zip
gcc-b4ab7d34f5ee89e23f75cb25585bc851c7f713b3.tar.gz
gcc-b4ab7d34f5ee89e23f75cb25585bc851c7f713b3.tar.bz2
libsanitizer merge from upstream r175049
From-SVN: r196009
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 c8e733f..02d2bfc 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-173241
+175049
The first line of this file holds the svn revision number of the
last merge done from the master library sources.