projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4933232 4ced60d)
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 13:07:12 +0000 (14:07 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 14 Feb 2012 13:07:12 +0000 (14:07 +0100)
* maint:
  fixup: do not tickle makefile-deps.test with the make_dryrun code
  gitattributes: custom merge driver for ChangeLog not needed anymore
  gitattributes: use "union" merge driver for NEWS


Trivial merge
Domain: System / Base;