]> git.saurik.com Git - bison.git/commit
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Tue, 26 Jun 2012 14:43:22 +0000 (16:43 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Tue, 26 Jun 2012 14:44:59 +0000 (16:44 +0200)
commit297e263a0050959e0fd139ad66e71383fc9ac4db
treeb91331b3243675bf4a084b532e849550f3012c55
parentea9a35c605c075c79da41bfeaaaa07b076bafc01
parenta32a2d57a5d931ad1e30d180f9d40b482b674593
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  tests: do not output m4 set up.
  tests: use the generic yyerror function.
  tests: use assert instead of plain abort.
  tests: improve the generic yylex implementation.
  tests: generalize the compilation macros.
  tests: fix confusion between api.prefix and name-prefix.
  maint: gitignores.
  yacc: work around the ylwrap limitation.

Conflicts:
NEWS
tests/local.at
NEWS
data/yacc.c
src/symtab.c
tests/actions.at
tests/calc.at
tests/conflicts.at
tests/input.at
tests/local.at
tests/named-refs.at
tests/regression.at