aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2020-10-16 10:03:04 +0200
committerMartin Liska <mliska@suse.cz>2020-10-16 10:57:03 +0200
commit0b997f6e07771c98178ea09f4a8c4446baaf84da (patch)
treec3ef933f3fda4195644c6734b2c212e9f77718e3 /libsanitizer/MERGE
parent4a70aa7a627c0b918ce1da75c0dbe088539e420f (diff)
downloadgcc-0b997f6e07771c98178ea09f4a8c4446baaf84da.zip
gcc-0b997f6e07771c98178ea09f4a8c4446baaf84da.tar.gz
gcc-0b997f6e07771c98178ea09f4a8c4446baaf84da.tar.bz2
libsanitizer: merge from master
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 e14e830..d2a2592 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-b638b63b99d66786cb37336292604a2ae3490cfd
+51ff04567b2f8d06b2062bd3ed72eab2e93e4466
The first line of this file holds the git revision number of the
last merge done from the master library sources.