From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 17 Jan 2010 13:22:56 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~446
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f68d0155cb558ada12c24fba3da4143755e4f3bf;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

f68d0155cb558ada12c24fba3da4143755e4f3bf
diff --cc tests/Makefile.am
index 449a36c99,c1600284c..3428b443c
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -301,8 -298,8 +303,9 @@@ exeext4.test 
  exsource.test \
  ext.test \
  ext2.test \
 +ext3.test \
  extra.test \
+ extra2.test \
  extra3.test \
  extra4.test \
  extra5.test \
diff --cc tests/Makefile.in
index 1d91851d4,295480382..b84dd1dca
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -542,8 -532,8 +544,9 @@@ exeext4.test 
  exsource.test \
  ext.test \
  ext2.test \
 +ext3.test \
  extra.test \
+ extra2.test \
  extra3.test \
  extra4.test \
  extra5.test \