summaryrefslogtreecommitdiff
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
commitd8eb4cf5492e0b4514d15f6510a8b2b856a1cc91 (patch)
tree15188d0e2c1d5ecb675801c4ffe4b718166dbf91 /ChangeLog
parent247ce538a48b4d211c05286312ee1ad7b4bf5518 (diff)
downloadgdb-d8eb4cf5492e0b4514d15f6510a8b2b856a1cc91.tar.gz
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 960350925a0..6c0d6e20ac8 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: