From c03c52480a18bf0d6060d99e597bc284fd576a31 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 29 Sep 2009 23:03:31 -0400 Subject: [PATCH] properly merge include/ChangeLog From-SVN: r152319 --- include/ChangeLog | 7 +++++++ include/ChangeLog.lambda | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 include/ChangeLog.lambda diff --git a/include/ChangeLog b/include/ChangeLog index f99325ec351b..2a2bebcd3c00 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2009-09-29 Jason Merrill + + * 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 * 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 6195e3484866..000000000000 --- a/include/ChangeLog.lambda +++ /dev/null @@ -1,6 +0,0 @@ -2009-09-29 Jason Merrill - - * 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.