]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 18 Apr 2012 17:12:49 +0000 (19:12 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 18 Apr 2012 17:12:49 +0000 (19:12 +0200)
* master:
  hacking: fix typo
  maint: version bump after beta release
  Beta release 1.11d (will become 1.12)
  tests: remove redundant 'set -e' calls
  tests: avoid spurious failures when cross-compiling
  maintainer-check: fix definition of $(ams) again

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1  2 
syntax-checks.mk
t/instdir-no-empty.sh
t/link_cond.sh
t/yacc-basic.sh
t/yacc-cxx.sh

Simple merge
Simple merge
diff --cc t/link_cond.sh
Simple merge
diff --cc t/yacc-basic.sh
Simple merge
diff --cc t/yacc-cxx.sh
Simple merge