]> git.saurik.com Git - bison.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorAkim Demaille <akim@lrde.epita.fr>
Fri, 4 May 2012 13:04:30 +0000 (15:04 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Fri, 4 May 2012 15:28:56 +0000 (17:28 +0200)
* origin/master:
  glr.c: untabify.
  glr.cc: untabify.
  glr.cc: formatting changes.
  glr.cc: remove unused signature.
  glr.cc: properly declare locations are const where appropriate.
  doc: fix @xref.

Conflicts:
data/glr.cc

1  2 
data/glr.cc
doc/bison.texinfo

diff --cc data/glr.cc
Simple merge
Simple merge