projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1eb0eb4 fad7b92)
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 26 Jul 2010 17:35:44 +0000 (19:35 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 26 Jul 2010 17:35:44 +0000 (19:35 +0200)
Conflicts: tests/distcom7.test

1  2 
ChangeLog patch | diff1 | diff2 | blob | history
tests/distcom7.test patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
diff --cc tests/distcom7.test
index 34f876e,3ea5096..c14d94c
--- 1/tests/distcom7.test
--- 2/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
+ 
+ :
Domain: System / Base;