merge from gcc

2013-12-23 18:30:21 +00:00
parent 53b14dc2b1
commit 2d15421aa8
2 changed files with 15 additions and 0 deletions
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-23  Bill Maddox  <maddox@google.com>
+
+	* demangle.h (enum gnu_v3_ctor_kinds):
+	Added literal gnu_v3_unified_ctor.
+	(enum gnu_v3_ctor_kinds):
+	Added literal gnu_v3_unified_dtor.
+
 2013-12-04  Richard Sandiford  <rdsandiford@googlemail.com>

 	* longlong.h: New file.