aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2004-10-06 10:15:24 +0000
committerPaolo Bonzini <pbonzini@redhat.com>2004-10-06 10:15:24 +0000
commit5e6b1f07c9a03646aa832de2bdcafcd1cdaf1067 (patch)
tree81f050a162d810c7252a8c1ac42f44c125028e97 /ChangeLog
parent4f8dc86255a26e0183ea8f8bb42e35a857e6ed6c (diff)
downloadnewlib-5e6b1f07c9a03646aa832de2bdcafcd1cdaf1067.zip
newlib-5e6b1f07c9a03646aa832de2bdcafcd1cdaf1067.tar.gz
newlib-5e6b1f07c9a03646aa832de2bdcafcd1cdaf1067.tar.bz2
2004-10-06 Paolo Bonzini <bonzini@gnu.org>
Fix wrong conflict resolution in: 2004-08-16 Paolo Bonzini <bonzini@gnu.org> * Makefile.in: Regenerate. * Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*) in the recursive `make', instead of hardwiring `all'. (Autogenerated TARGET-* variables): New.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9603509..6c0d6e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-06 Paolo Bonzini <bonzini@gnu.org>
+
+ Fix wrong conflict resolution in:
+
+ 2004-08-16 Paolo Bonzini <bonzini@gnu.org>
+
+ * Makefile.in: Regenerate.
+ * Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
+ in the recursive `make', instead of hardwiring `all'.
+ (Autogenerated TARGET-* variables): New.
+
2004-10-05 Ulrich Weigand <uweigand@de.ibm.com>
Merged from GCC / libtool upstream: