summaryrefslogtreecommitdiff
path: root/libsanitizer/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'libsanitizer/ChangeLog')
-rw-r--r--libsanitizer/ChangeLog9
1 files changed, 8 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 7e206f9b96c..0c7e4b753f4 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,6 +1,13 @@
2012-11-23 Kostya Serebryany <kcc@google.com>
- * merge.sh: a script that will help merges from upstream.
+ * merge.sh: Support tsan, support added/removed files.
+ * tsan/Makefile.am: Remove tsan_printf.cc.
+ * tsan/Makefile.in: Regenerated.
+ * other files: Merge from upstream r168514.
+
+2012-11-23 Kostya Serebryany <kcc@google.com>
+
+ * merge.sh: New file.
2012-11-23 Jakub Jelinek <jakub@redhat.com>