merge from gcc

[deliverable/binutils-gdb.git] / include / ChangeLog

diff --git a/include/ChangeLog b/include/ChangeLog
index 56314cbf355667c13604c1b6cb1ee08d63f1942c..bcaf5f2b2256b610d387905be51a2fc2795cdbd2 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16  Ian Lance Taylor  <iant@google.com>
+
+       * simple-object.h (simple_object_attributes_merge): Declare,
+       replacing simple_object_attributes_compare.
+
 2010-11-16  Jie Zhang  <jie.zhang@analog.com>
 
        * elf/bfin.h (EF_BFIN_CODE_IN_L1): Define.