2004-10-06 Paolo Bonzini <bonzini@gnu.org>
commit1820fafaca76e6d09e086e3f186c332b6324c73c
authorPaolo Bonzini <bonzini@gnu.org>
Wed, 6 Oct 2004 10:15:24 +0000 (6 10:15 +0000)
committerPaolo Bonzini <bonzini@gnu.org>
Wed, 6 Oct 2004 10:15:24 +0000 (6 10:15 +0000)
treee5e126fb7aea3d3333a3bccf045f6f4c43dd3da4
parent5d31d1a338f0a24bd1a8727b983b4a770e92729d
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.
ChangeLog
Makefile.in
Makefile.tpl