aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2022-08-30 11:45:34 +0200
committerMartin Liska <mliska@suse.cz>2022-08-30 12:53:50 +0200
commit600413c4f3d70392285192fb99634bcbeb97f83f (patch)
tree0586f1cc2feaa4f5a3d632926b08bde261c39786 /libsanitizer/MERGE
parentbdd3547ae4279c14a9db883719c9648ed09dc18a (diff)
downloadgcc-600413c4f3d70392285192fb99634bcbeb97f83f.zip
gcc-600413c4f3d70392285192fb99634bcbeb97f83f.tar.gz
gcc-600413c4f3d70392285192fb99634bcbeb97f83f.tar.bz2
libsanitizer: merge from master (84a71d5259c2682403cdbd8710592410a2f128ab)
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 691c82b..3ca670c 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-75f9e83ace52773af65dcebca543005ec8a2705d
+84a71d5259c2682403cdbd8710592410a2f128ab
The first line of this file holds the git revision number of the
last merge done from the master library sources.