]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into test-protocols
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 28 Sep 2011 09:17:33 +0000 (11:17 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 28 Sep 2011 09:17:33 +0000 (11:17 +0200)
* master:
  uninstall: "make uninstall" before "make install" works
  tests: fix tests on aclocal search path precedences

1  2 
ChangeLog
NEWS
lib/Automake/tests/Makefile.in
lib/Makefile.in
tests/Makefile.am
tests/Makefile.in

diff --cc ChangeLog
Simple merge
diff --cc NEWS
Simple merge
Simple merge
diff --cc lib/Makefile.in
Simple merge
Simple merge
Simple merge