]> git.saurik.com Git - bison.git/commit
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Thu, 29 Nov 2012 13:54:37 +0000 (14:54 +0100)
committerAkim Demaille <akim@lrde.epita.fr>
Thu, 29 Nov 2012 14:20:03 +0000 (15:20 +0100)
commit5807bb9156930091850a52b5bb9ab9f89082b04e
tree3ac34aa826fb892596a175a5741eb7b7c94a768c
parentf5fceda596e63df67e7dea89a4c3f9f069f467c3
parent511dd971ba0dcba64c5a113ee7b0fc40ff4e2943
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  doc: minor fixes
  doc: improve the index
  doc: introduce api.pure full, rearrange some examples
  yacc.c: support "%define api.pure full"
  local.at: improvements

Conflicts:
NEWS
data/yacc.c
doc/bison.texi
tests/calc.at
NEWS
data/yacc.c
doc/bison.texi
tests/actions.at
tests/calc.at
tests/local.at