]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 28 Jun 2012 16:52:16 +0000 (18:52 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 28 Jun 2012 16:52:16 +0000 (18:52 +0200)
* master:
  tests init: don't bother allowing '$me' to be overridable
  tests init: typofixes in comments
  tests: one test was not executable, make it so
  readme: fix typo in t/README: s/$((...)/$((...))/
  tests: don't skip if $(abs_builddir) or $(abs_srcdir) contain whitespace
  tests: avoid spurious maintainer-check failures
  tests: remove obsolete hacks around maintainer-check false positives

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1  2 
Makefile.am
gen-testsuite-part
t/README
t/ax/test-init.sh
t/subdir-order.sh
t/test-trs-recover.sh

diff --cc Makefile.am
Simple merge
Simple merge
diff --cc t/README
Simple merge
Simple merge
index 5ea7b79195ac7a77df45027a5ea267af5a6b502a,0ce19d9376f7c08f6d650f70ff622b174f3439a0..5ea7b79195ac7a77df45027a5ea267af5a6b502a
mode 100644,100755..100755
Simple merge