diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-12-14 15:43:27 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-12-14 15:43:27 +0100 |
| commit | b8c7e3f7ebf3ff8841b6bc1d224bbc87d71261ff (patch) | |
| tree | 71aaad70b655e191e1029b9507a4efc21595015b /.gitignore | |
| parent | 2674291c3389fcde8c7206f858df12d66f123837 (diff) | |
| parent | 454a1acda60854294ca6953621150707c037ee9a (diff) | |
| download | automake-b8c7e3f7ebf3ff8841b6bc1d224bbc87d71261ff.tar.gz | |
Merge branch 'maint'
* maint:
sync: update files from upstream with "make fetch"
gitignore: align with recent changes
fixup: add dummy rule for ChangeLog generation in Makefile.am
maint: no longer use AM_MAKEFLAGS in maintainer rules
maint: use more GNU make features in maintainer rules
maint: move maintainer make rules in maint.mk
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b800a68d7..a32310e70 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,7 @@ /doc/amhello/depcomp /doc/amhello/install-sh /doc/amhello/missing -/doc/web-manuals +/doc/web-manual /lib/Automake/Config.pm /test-suite.log /t/wrap/aclocal-1.* |