aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2009-09-29 23:03:31 -0400
committerJason Merrill <jason@gcc.gnu.org>2009-09-29 23:03:31 -0400
commitc03c52480a18bf0d6060d99e597bc284fd576a31 (patch)
tree6266f81c0551865538d02c54f22fe19a2904ac1c /include
parentd5f4edddeb609ad93c7a69ad4575b082de8dc707 (diff)
downloadgcc-c03c52480a18bf0d6060d99e597bc284fd576a31.zip
gcc-c03c52480a18bf0d6060d99e597bc284fd576a31.tar.gz
gcc-c03c52480a18bf0d6060d99e597bc284fd576a31.tar.bz2
properly merge include/ChangeLog
From-SVN: r152319
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog7
-rw-r--r--include/ChangeLog.lambda6
2 files changed, 7 insertions, 6 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index f99325e..2a2bebc 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-29 Jason Merrill <jason@redhat.com>
+
+ * demangle.h (enum demangle_component_type): Add
+ DEMANGLE_COMPONENT_LAMBDA, DEMANGLE_COMPONENT_DEFAULT_ARG,
+ DEMANGLE_COMPONENT_UNNAMED_TYPE.
+ (struct demangle_component): Add s_unary_num.
+
2009-09-25 Dodji Seketeli <dodji@redhat.com>
* dwarf2.h (enum dwarf_tag): Rename DW_TAG_template_parameter_pack and
diff --git a/include/ChangeLog.lambda b/include/ChangeLog.lambda
deleted file mode 100644
index 6195e34..0000000
--- a/include/ChangeLog.lambda
+++ /dev/null
@@ -1,6 +0,0 @@
-2009-09-29 Jason Merrill <jason@redhat.com>
-
- * demangle.h (enum demangle_component_type): Add
- DEMANGLE_COMPONENT_LAMBDA, DEMANGLE_COMPONENT_DEFAULT_ARG,
- DEMANGLE_COMPONENT_UNNAMED_TYPE.
- (struct demangle_component): Add s_unary_num.