]> git.saurik.com Git - bison.git/commit - src/parse-gram.y
Merge branch 'maint'
authorAkim Demaille <akim@lrde.epita.fr>
Fri, 3 Aug 2012 08:52:55 +0000 (10:52 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Fri, 3 Aug 2012 09:04:29 +0000 (11:04 +0200)
commitc85541913b99f841de090aacf626bb8f52f7f727
treeb18183666a1902df237c066269f6d027a03a14bb
parent95dbea81032ba903c0cb70dde1cee2bd8744fa8e
parent933ec5449fc9b8a831d6afe67535d2c2bdc528d2
Merge branch 'maint'

* origin/maint:
  maint: post-release administrivia
  version 2.6.2
  NEWS: update.
  yacc: remove trailing end of line at end of file
  thanks: fix a contributor name
  gnulib: update
  tests: synch line -> syncline, for consistency
  tests: synclines: style changes
  tests: synclines: fix perl invocation
  regen
  c++: trailing end-of-lines in %parse-param
  tests: simplify

Conflicts:
cfg.mk
data/glr.cc
data/yacc.c
src/parse-gram.c
src/parse-gram.h
src/parse-gram.y
NEWS
THANKS
cfg.mk
data/glr.c
data/glr.cc
data/yacc.c
src/parse-gram.y
tests/calc.at
tests/regression.at