Merge branch 'am-tests-setup'

author Stefano Lattarini <stefano.lattarini@gmail.com>

Sun, 17 Apr 2011 13:21:34 +0000 (15:21 +0200)

committer Stefano Lattarini <stefano.lattarini@gmail.com>

Sun, 17 Apr 2011 13:21:34 +0000 (15:21 +0200)
author Stefano Lattarini <stefano.lattarini@gmail.com>
Sun, 17 Apr 2011 13:21:34 +0000 (15:21 +0200)
committer Stefano Lattarini <stefano.lattarini@gmail.com>
Sun, 17 Apr 2011 13:21:34 +0000 (15:21 +0200)
diff --cc ChangeLog
Simple merge
diff --cc doc/automake.texi
Simple merge
diff --cc lib/Automake/tests/Makefile.in
Simple merge
diff --cc tests/Makefile.am
Simple merge
diff --cc tests/Makefile.in
Simple merge
diff --cc tests/depcomp8a.test
Simple merge
diff --cc tests/depcomp8b.test
Simple merge
author	Stefano Lattarini <stefano.lattarini@gmail.com>
	Sun, 17 Apr 2011 13:21:34 +0000 (15:21 +0200)
committer	Stefano Lattarini <stefano.lattarini@gmail.com>
	Sun, 17 Apr 2011 13:21:34 +0000 (15:21 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
doc/automake.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Automake/tests/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
tests/depcomp8a.test	patch \|	diff1 \|	diff2 \|	blob \| history
tests/depcomp8b.test	patch \|	diff1 \|	diff2 \|	blob \| history