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 4b0adecc5e9..ff5188f26cf 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-06 Kostya Serebryany <kcc@google.com>
+
+ * All files: Merge from upstream r169392.
+
2012-12-05 Kostya Serebryany <kcc@google.com>
* All files: Merge from upstream r169371.