summaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2013-02-21 10:57:10 +0000
committerKostya Serebryany <kcc@gcc.gnu.org>2013-02-21 10:57:10 +0000
commit7df59255e1accc8f95b4d90d1a17c60cd0e6e40e (patch)
tree0ad34c195787ec507c5bcdbb710bf127eb3a2fb5 /libsanitizer/MERGE
parent22deefcbb7c556a99fd72c1fb92a3a35b6dfd4b4 (diff)
downloadgcc-7df59255e1accc8f95b4d90d1a17c60cd0e6e40e.tar.gz
libsanitizer merge from upstream r175733
From-SVN: r196201
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 02d2bfcf512..28d1e49ab77 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-175049
+175733
The first line of this file holds the svn revision number of the
last merge done from the master library sources.