]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 1 May 2012 12:04:56 +0000 (14:04 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 1 May 2012 12:04:56 +0000 (14:04 +0200)
* maint:
  news: fix confusing wording
  news: fixed weaknesses in build system and testsuite
  bootstrap: consistently use correct copyright year
  fixup: remove leftover "TERM=ansi" definition in 't/color.sh'

1  2 
Makefile.am
NEWS

diff --cc Makefile.am
Simple merge
diff --cc NEWS
Simple merge