]> git.ipfire.org Git - thirdparty/automake.git/commit
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 26 Sep 2010 14:39:45 +0000 (16:39 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 26 Sep 2010 14:39:45 +0000 (16:39 +0200)
commitea1a4174a8328f0bbd6afa0110ac4e9dfafc1b71
tree813ab3e9b8c8403e0c9f3750c12e8c53295cef1e
parent7b0ff55f0ba84bbb4fad6e2af4d1c3bf03d6cfb8
parenta82bc0d5cfea18fc96476c23a4fb2d458af09c89
Merge branch 'maint'

Conflicts:
Makefile.am
Makefile.in
lib/Automake/Configure_ac.pm
ChangeLog
Makefile.am
Makefile.in
doc/automake.texi
lib/Automake/Channels.pm
lib/Automake/Configure_ac.pm
lib/Automake/XFile.pm
tests/Makefile.am
tests/Makefile.in
tests/README
tests/defs.in