]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 28 May 2013 19:55:33 +0000 (21:55 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 28 May 2013 19:55:33 +0000 (21:55 +0200)
* master:
  NEWS: fix typo
  NEWS: report recent documentation fix about AM_PROG_MKDIR_P
  NEWS: Automake 2.0 will assume "rm -f" without args work
  NEWS: on assuming "rm -f" without arguments work
  NEWS: fix a couple of typos in older entries
  docs: AM_PROG_MKDIR_P: will not be removed in 2.0 release of Automake
  docs: AM_PROG_CC_C_O: correct imprecise statements about it
  maint: sanity checks in 'check-minimal-autoconf' convenience target
  maint: test minimal supported autoconf through convenience target
  maint: install minimal supported autoconf through convenience targets
  test-lib: typofix in comments

1  2 
.gitignore
configure.ac
doc/automake-ng.texi
maintainer/maint.mk
t/ax/am-test-lib.sh

diff --cc .gitignore
index 21ec99f2ce27080e0257ba3e43e63d759d181d31,19da02f71233b83af498610b13277094523c5c5d..8f4bb192cd64fea24f573e03e45b3d98ef934b81
@@@ -1,5 -1,6 +1,7 @@@
 +/lib/am-ng
  /announcement
+ /maintainer/autoconf-*/
+ /maintainer/autoconf-*.tar.gz
  /ChangeLog
  /aclocal.m4
  /configure
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge