From: Akim Demaille <akim@lrde.epita.fr>
Date: Fri, 4 May 2012 13:04:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v2.7.90~450
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/520144aadc34f57ac0572ded66ab62fc32cb3069

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
---

520144aadc34f57ac0572ded66ab62fc32cb3069