]> git.ipfire.org Git - thirdparty/automake.git/commit
projects / thirdparty / automake.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ad748b8 73b74f8)
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 11 Jan 2011 01:35:38 +0000 (02:35 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 11 Jan 2011 01:35:38 +0000 (02:35 +0100)
commit85eea96a3159c41b6630fd26d6f090484a131460
tree9b1c9aadc16c28b2e7851c975cda4224c2c1b965tree
parentad748b8323dd2bac0dd61ac17c72ad363c68055ccommit | diff
parent73b74f839340b94dad94f090e7d8291064104d0dcommit | diff
Merge branch 'maint'

Conflicts:
ChangeLog

Apparently I messed up doing a previous 'git pull', so that the "latest"
maint I've merged into master (and pushed!) wasn't a fast-forward from
origin/maint.  Yay for me.  This merge should help cleaning up the mess.
ChangeLog diff1 | diff2 | blob | history
lib/Automake/Rule.pm diff1 | diff2 | blob | history
Mirror of https://github.com/autotools-mirror/automake.git