summaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-22 07:09:21 +0000
committerkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2014-05-22 07:09:21 +0000
commit7d752f28b590bbad13c877c2aa7f5f8de2cdff10 (patch)
treef90afdf42b3ae78508a5c6422f458a5bb0216aa2 /libsanitizer/MERGE
parentca1a66e9c405dff80abce41c96371525e515bdb4 (diff)
downloadgcc-7d752f28b590bbad13c877c2aa7f5f8de2cdff10.tar.gz
libsanitizer merge from upstream r209283
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210743 138bc75d-0d04-0410-961f-82ee72b054a4
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 4688f0c8693..84e88e10b77 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-196489
+209283
The first line of this file holds the svn revision number of the
last merge done from the master library sources.