]> git.ipfire.org Git - thirdparty/automake.git/commit
projects / thirdparty / automake.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 317e6ca e3b0e12)
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 5 Jan 2012 19:09:24 +0000 (20:09 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 6 Jan 2012 08:29:40 +0000 (09:29 +0100)
commitd1fbc759bfa42e5e0fe5c283dfcf9b642e815393
tree6260fb8688b6cf94bc6dfbcc5131e4f24c8e0ab8tree
parent317e6ca3cea900d1f401c27814cf672303aa813acommit | diff
parente3b0e12400f5fa4220fc0aa79dd0989e56def9c6commit | diff
Merge branch 'maint'

* maint:
  parallel-tests: avoid issue with overly long lines in sed input

Additional edits:
* NEWS: Remove entry from merged commit, since that will also be
present in the NEWS file of automake 1.11.3.
* lib/am/check.am (check-TESTS, recheck, recheck-html): Rework
merged changes to adapt them to the different form these recipes
has assumed in the master branch (w.r.t. the maint branch).
lib/am/check.am diff1 | diff2 | blob | history
Mirror of https://github.com/autotools-mirror/automake.git