From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 26 Jul 2010 17:35:44 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~395
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba70e3a70829f51f90848d13fd27c912d3c32b02;p=thirdparty%2Fautomake.git

Merge branch 'maint'

Conflicts: tests/distcom7.test
---

ba70e3a70829f51f90848d13fd27c912d3c32b02
diff --cc tests/distcom7.test
index 34f876e69,3ea509605..c14d94c3c
--- a/tests/distcom7.test
+++ b/tests/distcom7.test
@@@ -39,4 -42,6 +42,6 @@@ EN
  
  $ACLOCAL
  AUTOMAKE_fails --add-missing subdir/Makefile
 -grep 'full run' stderr
 +grep 'without.*Makefile.*arguments' stderr
+ 
+ :