aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2013-02-13 10:46:01 +0000
committerkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2013-02-13 10:46:01 +0000
commit7da89e8076fc3bc8b0eb22721afdce421d225d71 (patch)
treec4504a71a4de65630ff00dd7aa8e062235fc5076 /libsanitizer/MERGE
parentc31c80df29f1ac080fd4b89965599e1b337b15a1 (diff)
libsanitizer merge from upstream r175049
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196009 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 c8e733f1594..02d2bfcf512 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.