From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 25 Aug 2011 19:20:57 +0000 (+0200)
Subject: Merge branch 'maint' into java-work
X-Git-Tag: ng-0.5a~123^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60bd0bf85380e6cabb50ff07cec3366c18f170b2;p=thirdparty%2Fautomake.git

Merge branch 'maint' into java-work

* maint:
  tests: list "forgotten" test script in TESTS
  ylwrap: fix unusual indentation whitespace
---

60bd0bf85380e6cabb50ff07cec3366c18f170b2
diff --cc tests/Makefile.am
index cbd5b654c,a1c67ffc3..a93f4f86f
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -445,21 -444,9 +445,22 @@@ java.test 
  java2.test \
  java3.test \
  java-check.test \
 +java-clean.test \
+ java-empty-classpath.test \
  javaprim.test \
  javasubst.test \
 +javaflags.test \
 +java-extra.test \
 +java-noinst.test \
 +java-nobase.test \
 +java-compile-install.test \
 +java-compile-run-flat.test \
 +java-compile-run-nested.test \
 +java-sources.test \
 +java-no-duplicate.test \
 +java-mix.test \
 +java-uninstall.test \
 +java-rebuild.test \
  ldadd.test \
  ldflags.test \
  lex.test \
diff --cc tests/Makefile.in
index 2fc45d195,4b2d8457d..434644d1b
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -723,21 -722,9 +723,25 @@@ java.test 
  java2.test \
  java3.test \
  java-check.test \
++<<<<<<< HEAD
 +java-clean.test \
++=======
+ java-empty-classpath.test \
++>>>>>>> maint
  javaprim.test \
  javasubst.test \
 +javaflags.test \
 +java-extra.test \
 +java-noinst.test \
 +java-nobase.test \
 +java-compile-install.test \
 +java-compile-run-flat.test \
 +java-compile-run-nested.test \
 +java-sources.test \
 +java-no-duplicate.test \
 +java-mix.test \
 +java-uninstall.test \
 +java-rebuild.test \
  ldadd.test \
  ldflags.test \
  lex.test \