]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'micro' into minor
authorMathieu Lirzin <mthl@gnu.org>
Fri, 16 Jun 2017 20:46:16 +0000 (22:46 +0200)
committerMathieu Lirzin <mthl@gnu.org>
Fri, 16 Jun 2017 20:46:16 +0000 (22:46 +0200)
20 files changed:
1  2 
NEWS
bin/automake.in
configure.ac
lib/am/configure.am
lib/am/depend.am
m4/amversion.m4
m4/depout.m4
m4/make.m4
t/depcomp8a.sh
t/depcomp8b.sh
t/depend-postproc.sh
t/extra-sources.sh
t/lex-depend-cxx.sh
t/lex-depend-grep.sh
t/list-of-tests.mk
t/pr224.sh
t/subobj-indir-pr13928.sh
t/subobj-vpath-pr13928.sh
t/subobj11b.sh
t/subobj11c.sh

diff --cc NEWS
Simple merge
diff --cc bin/automake.in
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
diff --cc m4/amversion.m4
Simple merge
diff --cc m4/depout.m4
Simple merge
diff --cc m4/make.m4
Simple merge
diff --cc t/depcomp8a.sh
Simple merge
diff --cc t/depcomp8b.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/pr224.sh
Simple merge
Simple merge
Simple merge
diff --cc t/subobj11b.sh
Simple merge
diff --cc t/subobj11c.sh
Simple merge