Merge branch 'je-silent'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 24 Jan 2010 11:37:36 +0000 (12:37 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 24 Jan 2010 11:37:36 +0000 (12:37 +0100)
* je-silent:
  Fix silent-rules output for disabled dependency tracking.

1  2 
NEWS
THANKS
automake.in
tests/Makefile.am
tests/Makefile.in

diff --cc NEWS
Simple merge
diff --cc THANKS
Simple merge
diff --cc automake.in
index 482972b,116fc7d..8029dc9
mode 100644,100755..100644
@@@ -613,7 -605,7 +613,8 @@@ silent4.test 
  silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
+ silent9.test \
  sinclude.test \
  srcsub.test \
  srcsub2.test \
@@@ -854,7 -839,7 +854,8 @@@ silent4.test 
  silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
+ silent9.test \
  sinclude.test \
  srcsub.test \
  srcsub2.test \