Merge branch 'master' into test-protocols
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 6 Sep 2011 09:02:38 +0000 (11:02 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 6 Sep 2011 09:02:38 +0000 (11:02 +0200)
commit371bdf6bf8b61c3b78c8915068b5b806ec2b62cf
treef4b9f50d2510954bf91c8198502cfa5f497e5042
parent5957249003ff8a68044602cf10aaaf31480edb99
parent8bae346819ce77fa3d653af4abfc6f1da9788303
Merge branch 'master' into test-protocols

* master:
  * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
  fix: list test 'vala-vpath.test' in XFAIL_TESTS
  tests: simplify wrapper for aclocal
  fix: minor typo in ChangeLog
  automake: fix regression due to de-ansification support removal
  coverage: vala support failing for VPATH from-scratch builds
  docs: report few more automake parsing limitations
  automake: cleanups after de-ansification support removal (2)
  automake: cleanups after de-ansification support removal (1)
  ansi: remove obsolete code/files for de-ANSI-fication support
  ansi: reject attempts to use automatic de-ANSI-fication support
  tests: remove tests about obsolete de-ANSI-fication support
  docs: remove description of de-ANSI-fication support from manual
ChangeLog
NEWS
automake.in
doc/automake.texi
lib/Makefile.am
lib/Makefile.in
tests/Makefile.am
tests/Makefile.in
tests/defs-static.in