]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 16 Jan 2013 12:20:12 +0000 (13:20 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 16 Jan 2013 12:20:12 +0000 (13:20 +0100)
* maint:
  subdir-objects: complain if it isn't enabled
  plans: update w.r.t. latest changes

1  2 
automake.in

diff --cc automake.in
Simple merge