projects / platform / upstream / automake.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5f83b8 a8933e8)
Merge branch 'branch-1.13.2' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 21 Feb 2013 15:10:16 +0000 (16:10 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 21 Feb 2013 15:10:16 +0000 (16:10 +0100)
* branch-1.13.2:
  aclocal: fix for more-than-once specified directories
  aclocal: just warn if the primary local m4 dir doesn't exist (don't error)

1  2 
NEWS patch | diff1 | diff2 | blob | history
aclocal.in patch | diff1 | diff2 | blob | history

diff --cc NEWS
Simple merge
diff --cc aclocal.in
Simple merge
Domain: System / Base;