diff options
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 11 |
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: |