aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2004-10-06 10:09:29 +0000
committerPaolo Bonzini <bonzini@gcc.gnu.org>2004-10-06 10:09:29 +0000
commit7e0b5752feb7597cf2fc8ca97c9b65341f4b9d58 (patch)
tree87d8b5f23f248329f7107b9b4f0ef2d7d3e4d025 /ChangeLog
parentdbb8bfe8c5f697ec3f94251022aaccd13f95f4e9 (diff)
downloadgcc-7e0b5752feb7597cf2fc8ca97c9b65341f4b9d58.zip
gcc-7e0b5752feb7597cf2fc8ca97c9b65341f4b9d58.tar.gz
gcc-7e0b5752feb7597cf2fc8ca97c9b65341f4b9d58.tar.bz2
[multiple changes]
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. From-SVN: r88594
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 587f7cd..4aa63ba 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 Tomer Levi <Tomer.Levi@nsc.com>
* configure.in: Enable target-libgloss for crx-*-*.