aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2021-11-05 18:11:23 +0100
committerMartin Liska <mliska@suse.cz>2021-11-05 18:21:27 +0100
commit2afc8f0b9198f3ee8274cf9c6b9352cab6cf9d4b (patch)
treecb3f31db83c81ead0da8f8f7d2a5f74531c3b73f /libsanitizer/MERGE
parent1f6dd5de33912c261a5003150212c290165ac1b6 (diff)
downloadgcc-2afc8f0b9198f3ee8274cf9c6b9352cab6cf9d4b.zip
gcc-2afc8f0b9198f3ee8274cf9c6b9352cab6cf9d4b.tar.gz
gcc-2afc8f0b9198f3ee8274cf9c6b9352cab6cf9d4b.tar.bz2
libsanitizer: merge from master (78d3e0a4f1406b17cdecc77540e09210670fe9a9).
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 ed4b013..c3463bf 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-c86b4503a94c277534ce4b9a5c015a6ac151b98a
+78d3e0a4f1406b17cdecc77540e09210670fe9a9
The first line of this file holds the git revision number of the
last merge done from the master library sources.