aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2004-10-06 10:15:24 +0000
committerPaolo Bonzini <bonzini@gnu.org>2004-10-06 10:15:24 +0000
commitd27cc32edd9a133cc634be2cca62c5094d5b782b (patch)
treeff633b51e24326fb1888a4e35960dc62cf7f3400 /ChangeLog
parent2348555434c49b1f1e6f006f7ad43f7a1603747c (diff)
downloadgdb-d27cc32edd9a133cc634be2cca62c5094d5b782b.zip
gdb-d27cc32edd9a133cc634be2cca62c5094d5b782b.tar.gz
gdb-d27cc32edd9a133cc634be2cca62c5094d5b782b.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: