]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
projects / thirdparty / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4980dc1 140ce85)
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 1 May 2012 12:06:33 +0000 (14:06 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 1 May 2012 12:06:33 +0000 (14:06 +0200)
* master:
  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 patch | diff1 | diff2 | blob | history
bootstrap.sh patch | diff1 | diff2 | blob | history
t/color.sh patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc bootstrap.sh
Simple merge
diff --cc t/color.sh
Simple merge
Mirror of https://github.com/autotools-mirror/automake.git