ChangeLog: Merge text from include/ChangeLog.

	* ChangeLog: Merge text from include/ChangeLog.
	* include/ChangeLog: Delete.

From-SVN: r82984

libcpp/ChangeLog

@@ -21,6 +21,14 @@
 	* directives.c (struct answer): Move to cpp-id-data.h.
 	(do_assert): Honour alloc_subobject.
 
+	* include/symtab.h (struct ht): Add field 'alloc_subobject'.
+	* include/cpplib.h (struct cpp_string): Add GTY marker.
+	(enum cpp_token_fld_kind): New.
+	(struct cpp_token): Add GTY markers.
+	(cpp_token_val_index): Prototype.
+	(CPP_HASHNODE_VALUE_IDX): New.
+	(struct cpp_hashnode): Don't skip fields of 'value' when marking.
+	* include/cpp-id-data.h: New file.
 
 2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
 
@@ -76,6 +84,8 @@
 	(ht_destroy): Honour entries_owned.
 	(ht_expand): Likewise.
 	(ht_load): New.
+	* include/symtab.h (struct ht): New field 'entries_owned'
+	(ht_load): New prototype.
 
 2004-05-26  Paolo Bonzini  <bonzini@gnu.org>
 
@@ -129,4 +139,8 @@
 	* line-map.c: Moved from gcc.  Do not include intl.h.
 	* mkdeps.c: Moved from gcc.
 	* system.h: New file.
-
+	* include/cpplib.h: Moved from gcc.  Change header guard name.
+	* include/line-map.h: Moved from gcc.  Change header guard name.
+	* include/mkdeps.h: Moved from gcc.  Change header guard name.
+	* include/symtab.h: Moved from gcc/hashtable.h.  Change header
+	guard name.

libcpp/include/ChangeLog

-2004-06-09  Geoffrey Keating  <geoffk@apple.com>
-
-	* symtab.h (struct ht): Add field 'alloc_subobject'.
-	* cpplib.h (struct cpp_string): Add GTY marker.
-	(enum cpp_token_fld_kind): New.
-	(struct cpp_token): Add GTY markers.
-	(cpp_token_val_index): Prototype.
-	(CPP_HASHNODE_VALUE_IDX): New.
-	(struct cpp_hashnode): Don't skip fields of 'value' when marking.
-	* cpp-id-data.h: New file.
-
-2004-05-29  Geoffrey Keating  <geoffk@apple.com>
-
-	* symtab.h (struct ht): New field 'entries_owned'
-	(ht_load): New prototype.
-
-2004-05-23  Paolo Bonzini  <bonzini@gnu.org>
-
-	* cpplib.h: Moved from gcc.  Change header guard name.
-	* line-map.h: Moved from gcc.  Change header guard name.
-	* mkdeps.h: Moved from gcc.  Change header guard name.
-	* symtab.h: Moved from gcc/hashtable.h.  Change header
-	guard name.