2004-10-06 Paolo Bonzini <bonzini@gnu.org>
authorPaolo Bonzini <bonzini@gnu.org>
Wed, 6 Oct 2004 10:15:24 +0000 (10:15 +0000)
committerPaolo Bonzini <bonzini@gnu.org>
Wed, 6 Oct 2004 10:15:24 +0000 (10:15 +0000)
commitd27cc32edd9a133cc634be2cca62c5094d5b782b
treeff633b51e24326fb1888a4e35960dc62cf7f3400
parent2348555434c49b1f1e6f006f7ad43f7a1603747c
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