diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-07-06 10:58:26 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-07-06 11:00:57 +0200 |
| commit | 60aa04a236004d3d03f00aeaf07b643a52ef0760 (patch) | |
| tree | 497f52b8113bbdd4effe5e9343a9b13a96184cca /m4 | |
| parent | ccdc1577ef7fb32a5e30cb655337e7cd42b98987 (diff) | |
| parent | a59a6ddef4a130b16d619e561a5d9886e305ac36 (diff) | |
| download | bison-60aa04a236004d3d03f00aeaf07b643a52ef0760.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
maint: update release instructions
maint: post-release administrivia
version 2.5.90
build: fix gen-ChangeLog call.
gnulib: update.
tests: fix SKIP_IF for Java.
api.prefix: incompatible with %name-prefix.
api.prefix: strengthen the tests and fix push-parsers.
skeletons: style changes.
NEWS: minor changes.
api.prefix: improve the documentation for YYDEBUG.
gnulib: update.
Conflicts:
NEWS
cfg.mk
data/bison.m4
doc/bison.texi
m4/.gitignore
tests/calc.at
tests/headers.at
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/m4/.gitignore b/m4/.gitignore index 990b1a57..e157f19c 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -180,3 +180,6 @@ /xalloc.m4 /xsize.m4 /xstrndup.m4 +/off_t.m4 +/sys_types_h.m4 +/fseterr.m4 |