summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2009-09-30 03:03:31 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2009-09-30 03:03:31 +0000
commit4817b87c1056b8a7bd27046a2c2843e4068d8ebc (patch)
tree6266f81c0551865538d02c54f22fe19a2904ac1c /include
parenta8b750816ddebe7302b52551d9cb745e77d95152 (diff)
downloadgcc-4817b87c1056b8a7bd27046a2c2843e4068d8ebc.tar.gz
properly merge include/ChangeLog
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@152319 138bc75d-0d04-0410-961f-82ee72b054a4
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 f99325ec351..2a2bebcd3c0 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 6195e348486..00000000000
--- 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.