diff options
author | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-06 10:09:29 +0000 |
---|---|---|
committer | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-06 10:09:29 +0000 |
commit | 68b4a982025df49713ae88c08c9a430c3c8866c7 (patch) | |
tree | 87d8b5f23f248329f7107b9b4f0ef2d7d3e4d025 /ChangeLog | |
parent | 8a86cf44d44dcdab6ddf46e3e447f58bb79637e9 (diff) | |
download | gcc-68b4a982025df49713ae88c08c9a430c3c8866c7.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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88594 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 587f7cd086b..4aa63ba1159 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-*-*. |