]> git.saurik.com Git - bison.git/commit - doc/bison.texi
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Fri, 6 Jul 2012 08:58:26 +0000 (10:58 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Fri, 6 Jul 2012 09:00:57 +0000 (11:00 +0200)
commit60aa04a236004d3d03f00aeaf07b643a52ef0760
tree497f52b8113bbdd4effe5e9343a9b13a96184cca
parentccdc1577ef7fb32a5e30cb655337e7cd42b98987
parenta59a6ddef4a130b16d619e561a5d9886e305ac36
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
12 files changed:
Makefile.am
NEWS
README-hacking
cfg.mk
data/bison.m4
data/yacc.c
doc/bison.texi
m4/.gitignore
tests/calc.at
tests/headers.at
tests/input.at
tests/local.at