diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-07-19 17:32:01 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-07-19 17:39:13 +0200 |
| commit | 3eb4f1a3e62807125a815dc572da9204b5b51865 (patch) | |
| tree | 4b26a70460d3922290c7d94bd22cbd5f00e933ce /m4 | |
| parent | 9553083c729070877095948ba2d48553690ac9e9 (diff) | |
| parent | d0d3313d10a28aa6fe77f158d61b84424aa9b3ce (diff) | |
| download | bison-3eb4f1a3e62807125a815dc572da9204b5b51865.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
maint: update gnu-web-doc-update.
maint: post-release administrivia
version 2.6
maint: prepare for release 2.6
maint: post-release administrivia
version 2.5.91
maint: prepare NEWS.
maint: fix spaces.
tests: adjust to case where the C compiler is actually a C++ compiler
tests: fix dependencies
doc: fix Texinfo command
maint: Valgrind on OS X.
tests: be sure that backups are safe.
maint: dead comment.
tests: refactor for legibility.
tests: refactor the bison invocations.
maint: fix syntax-check ignore patterns.
gnulib: update
gnulib: update.
gnulib: update
Conflicts:
build-aux/Makefile.am
cfg.mk
tests/Makefile.am
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/.gitignore | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/m4/.gitignore b/m4/.gitignore index e157f19c..875400a9 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -34,6 +34,7 @@ /fprintf-posix.m4 /frexp.m4 /frexpl.m4 +/fseterr.m4 /fstat.m4 /getdtablesize.m4 /getopt.m4 @@ -180,6 +181,3 @@ /xalloc.m4 /xsize.m4 /xstrndup.m4 -/off_t.m4 -/sys_types_h.m4 -/fseterr.m4 |