]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'minor'
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 31 Mar 2016 23:45:26 +0000 (16:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 31 Mar 2016 23:45:26 +0000 (16:45 -0700)
1  2 
bin/automake.in
lib/am/distdir.am

diff --cc bin/automake.in
Simple merge
Simple merge