summaryrefslogtreecommitdiff
path: root/libsanitizer/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'libsanitizer/ChangeLog')
-rw-r--r--libsanitizer/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index d93e7db9ee1..b8f0bfddc73 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,5 +1,9 @@
2018-10-31 Martin Liska <mliska@suse.cz>
+ * All source files: Merge from upstream 345033.
+
+2018-10-31 Martin Liska <mliska@suse.cz>
+
* HOWTO_MERGE: Enhance documentation.
* merge.sh: Add support for git as well.