diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-24 11:05:24 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-24 11:05:24 +0100 |
commit | a3f66de9d0d0126dbefb08a69ea2a326fc6a6649 (patch) | |
tree | d02830a60166bb106bee178b39fa528659d9f33c /.gitignore | |
parent | c3bcf99ccfdb499e0e97128910a5d920ab5338f0 (diff) | |
parent | e3351076de09b744d3387699fa20f1ec85f9ba58 (diff) | |
download | automake-a3f66de9d0d0126dbefb08a69ea2a326fc6a6649.tar.gz |
Merge branch 'master' into testsuite-work
* master:
gitignore: use only one .gitignore file, in the top-level directory
tests: one more fixlet for gettext macros requirement
tests: fix handling of gettext macros requirement
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 57 |
1 files changed, 52 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 96d603ea0..007475929 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,62 @@ -/autom4te.cache -/aclocal -/automake +Makefile.in +Makefile /aclocal.m4 /configure +/autom4te.cache /config.cache /config.log /config.status /config.status.lineno /configure.lineno -Makefile.in -Makefile +/aclocal +/automake +/doc/amhello-*.tar.gz +/doc/automake.info +/doc/automake.info-[0-9] +/doc/automake*.1 +/doc/aclocal*.1 +/doc/stamp-vti +/doc/version.texi +/doc/automake.ac +/doc/automake.aux +/doc/automake.cm +/doc/automake.cp +/doc/automake.cps +/doc/automake.dvi +/doc/automake.fn +/doc/automake.fns +/doc/automake.html +/doc/automake.ky +/doc/automake.log +/doc/automake.op +/doc/automake.pdf +/doc/automake.pg +/doc/automake.ps +/doc/automake.toc +/doc/automake.tp +/doc/automake.tr +/doc/automake.vr +/doc/automake.vrs +/doc/amhello/Makefile.in +/doc/amhello/aclocal.m4 +/doc/amhello/config.h.in +/doc/amhello/config.h.in~ +/doc/amhello/configure +/doc/amhello/depcomp +/doc/amhello/install-sh +/doc/amhello/missing +/lib/Automake/Config.pm +/lib/Automake/tests/*.log +/lib/Automake/tests/*.trs +/tests/aclocal-1.* +/tests/automake-1.* +/tests/defs-static +/tests/testsuite-part.am +/tests/*-w.tap +/tests/*-w.test +/tests/*.dir +/tests/*.log +/tests/*.trs cscope.files cscope.in.out cscope.out |