aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2019-11-07 10:33:54 +0100
committerMartin Liska <marxin@gcc.gnu.org>2019-11-07 09:33:54 +0000
commitcb7dc4da4ccc475675b5aec6a08d3e8c0a1761e4 (patch)
tree610840af295a13e6f4c2e87e7bfe52a4723ca534 /libsanitizer/MERGE
parent29f3def30844dd13e79972fa03a50af68120f7ac (diff)
downloadgcc-cb7dc4da4ccc475675b5aec6a08d3e8c0a1761e4.zip
gcc-cb7dc4da4ccc475675b5aec6a08d3e8c0a1761e4.tar.gz
gcc-cb7dc4da4ccc475675b5aec6a08d3e8c0a1761e4.tar.bz2
Libsanitizer: merge from trunk
2019-11-07 Martin Liska <mliska@suse.cz> * merge.sh: Update to use llvm-project git repository. * all source files: Merge from upstream 82588e05cc32bb30807e480abd4e689b0dee132a. From-SVN: r277909
Diffstat (limited to 'libsanitizer/MERGE')
-rw-r--r--libsanitizer/MERGE4
1 files changed, 2 insertions, 2 deletions
diff --git a/libsanitizer/MERGE b/libsanitizer/MERGE
index b7bf252..49ee2c3 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-375507
+82588e05cc32bb30807e480abd4e689b0dee132a
-The first line of this file holds the svn revision number of the
+The first line of this file holds the git revision number of the
last merge done from the master library sources.