[libsanitizer] merge from upstream r168514

[thirdparty/gcc.git] / libsanitizer / ChangeLog

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 7e206f9b96ce4f33bec729af2c1cc3e48118696a..0c7e4b753f4cf2c69812ed1ce9ce24624b2e1875 100644 (file)
--- 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>