projects / platform / upstream / automake.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5368def 018a186)
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 26 Apr 2012 15:52:31 +0000 (17:52 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 26 Apr 2012 15:52:31 +0000 (17:52 +0200)
commit8ce1b6c9863659835c7a5bcd13d2c1b6b55a1e69
treefca076ddadbf22347fbd5ce0b07d0fbb13bd90ebtree | snapshot
parent5368def8bb1635d7275a2ac3e08b8127933afe05commit | diff
parent018a186636ba4078496f56a945d25087bca127a3commit | diff
Merge branch 'maint'

* maint:
  maint: don't use "union" merge driver for NEWS anymore
  build: avoid too greedy rebuilds in the testsuite
  tests: avoid yet another spurious environment influence
  tests: fix a failure in Lex/C++ tests on Mac OS X
  tests: fix a spurious failure due to truncated timestamps
  build: require autoconf 2.69
  build: don't require minimal automake version in AM_INIT_AUTOMAKE

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
configure.ac diff1 | diff2 | blob | history
Domain: System / Base;