]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 11 Apr 2012 20:19:22 +0000 (22:19 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 11 Apr 2012 20:19:22 +0000 (22:19 +0200)
* master:
  self checks: avoid spurious failures when keep_testdirs=yes
  fixup: some weaknesses in a self-check test case
  maintcheck: avoid yet more spurious failures (2)
  maintcheck: avoid yet more spurious failures (1)
  hacking: fixlets w.r.t. the release procedure
  maintcheck: fix spurious failures
  maint: version bump after beta release
  Beta release 1.11b (will become 1.12)
  sync: some auxiliary files synced from upstream
  hacking: described new branching policy for 1.12 an later
  vala tests: avoid spurious failure with older GObject

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1  2 
syntax-checks.mk
t/tap-doc2.sh
t/vala2.sh
t/vala3.sh
t/vala5.sh

Simple merge
diff --cc t/tap-doc2.sh
Simple merge
diff --cc t/vala2.sh
Simple merge
diff --cc t/vala3.sh
Simple merge
diff --cc t/vala5.sh
Simple merge