]> git.saurik.com Git - bison.git/commit
projects / bison.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72cd9a9 7020e5f)
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)
commit520144aadc34f57ac0572ded66ab62fc32cb3069
tree75e8b8031142b022b1e3681604fd6a4954307a5dtree | snapshot
parent72cd9a913f6d282c5e24990505c2c820bda2bf1bcommit | diff
parent7020e5f0507f402d5763c5a328d6e11913feced0commit | diff
Merge remote-tracking branch 'origin/master'

* 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
data/glr.cc diff1 | diff2 | blob | history
doc/bison.texinfo diff1 | diff2 | blob | history
bison