]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 28 Sep 2011 14:58:52 +0000 (16:58 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 28 Sep 2011 14:58:52 +0000 (16:58 +0200)
* maint:
  fix: regenerate Makefile.in files
  maintcheck: fix usage of `cd' instead of `$(am__cd)'

1  2 
ChangeLog
Makefile.in
doc/Makefile.in
lib/Automake/Makefile.in
lib/Automake/tests/Makefile.in
lib/Makefile.in
lib/am/Makefile.in
m4/Makefile.in
tests/Makefile.in

diff --cc ChangeLog
Simple merge
diff --cc Makefile.in
Simple merge
diff --cc doc/Makefile.in
Simple merge
Simple merge
Simple merge
diff --cc lib/Makefile.in
Simple merge
Simple merge
diff --cc m4/Makefile.in
Simple merge
Simple merge