aboutsummaryrefslogtreecommitdiff
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 9005302..a98290d 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-27 Kostya Serebryany <kcc@google.com>
+
+ * All files: Merge from upstream r168699.
+
2012-11-24 Kostya Serebryany kcc@google.com
Jack Howarth <howarth@bromo.med.uc.edu>