X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2FChangeLog;h=6c14abba3d27c98251f490a7dd0cc903d327a03e;hb=d947df3999b4edfca9f6464eeef77c9dcb9ee156;hp=413d8c631e6e12234c242f616e65955ed920768c;hpb=9fa6c850d65d8d017eea467beaf5b608794cfcb7;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 413d8c631e6..6c14abba3d2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-15  Paolo Bonzini  <bonzini@gnu.org>
+
+	* acinclude.m4: Remove useless multilib configury.
+	* Makefile.am: Remove useless multilib rules.
+	* aclocal.m4: Regenerate.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
 2004-06-15  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/ext/hashtable.h: Trivial formatting fixes.
@@ -33,6 +41,7 @@
 	decrease __nmatches and increase __i3 at once, only either of
 	the two; tidy.
 
+>>>>>>> 1.2516
 2004-06-13  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/locale_facets.tcc (time_get<>::do_get_time,