properly merge include/ChangeLog

From-SVN: r152319

properly merge include/ChangeLog
From-SVN: r152319
c03c5248 · Jason Merrill · Jason Merrill · d5f4eddd · c03c5248 · d5f4eddd
Commit c03c5248 authored Sep 29, 2009 by Jason Merrill Committed by Jason Merrill Sep 29, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

include/ChangeLog
+7 -0

include/ChangeLog.lambda
+0 -6

No files found.
--- a/include/ChangeLog
+++ b/include/ChangeLog
+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

--- a/include/ChangeLog.lambda
+++ b/include/ChangeLog.lambda
-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.