| commit | bd7ff422f866a08064eb9a01a106ab1fa6425bf5 | |
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | |
| Tue, 14 Feb 2012 12:37:05 +0000 (14 13:37 +0100) | ||
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | |
| Tue, 14 Feb 2012 12:37:05 +0000 (14 13:37 +0100) | ||
| tree | eb9bd1d45f45514ad30c0256abc2c6adcd5f220d | treesnapshot (tar.gz zip) |
| parent | c0d107daf4e51056ceb6fd2df4da9f90cdbedb46 | commitdiff |
| parent | 06684c510ab3115093178cdcfb28c2fff41b324c | commitdiff |
Merge branch 'maint' into branch-1.11
* maint:
gitattributes: custom merge driver for ChangeLog not needed anymore
gitattributes: use "union" merge driver for NEWS
tests: fix a timestamp-related spurious failures
dryrun: fix regression with '$(am__make_dryrun)'
test defs: function 'is_newest' now works also with directories
refactor: new variable telling whether make is running in "dry mode"
tests: do not clobber the modified CC
tests: put AM_PROG_CC_C_O before AC_OUTPUT to help losing compilers
* maint:
gitattributes: custom merge driver for ChangeLog not needed anymore
gitattributes: use "union" merge driver for NEWS
tests: fix a timestamp-related spurious failures
dryrun: fix regression with '$(am__make_dryrun)'
test defs: function 'is_newest' now works also with directories
refactor: new variable telling whether make is running in "dry mode"
tests: do not clobber the modified CC
tests: put AM_PROG_CC_C_O before AC_OUTPUT to help losing compilers
| tests/defs.in | diff1 | diff2 | blobhistory |
| tests/depcomp8b.test | diff1 | diff2 | blobhistory |
| tests/list-of-tests.mk | diff1 | diff2 | blobhistory |