]> git.saurik.com Git - bison.git/commit
projects / bison.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68ac70b fb4c8a7)
Merge remote-tracking branch 'origin/branch-2.6' into maint
authorAkim Demaille <akim@lrde.epita.fr>
Mon, 26 Nov 2012 08:05:28 +0000 (09:05 +0100)
committerAkim Demaille <akim@lrde.epita.fr>
Mon, 26 Nov 2012 08:05:28 +0000 (09:05 +0100)
commitc6bf97ccb45672a004ef376b9f3e578d2f558d5f
tree848e9f1b3375f18c79b6ea2a4d1386a28b0eeb70tree | snapshot
parent68ac70bc7bf365fa17bd6d7ea597fa0a05488b8dcommit | diff
parentfb4c8a7cb97844f6c66921a77e79311a19d12fc2commit | diff
Merge remote-tracking branch 'origin/branch-2.6' into maint

* origin/branch-2.6:
  yacc.c: always initialize yylloc
  doc: one of the fixes for an ambiguous grammar was ambiguous too
  doc: fix the dangling else with precedence directives
  doc: prefer "token" to TOKEN
  doc: formatting changes

Conflicts:
NEWS
doc/bison.texi
NEWS diff1 | diff2 | blob | history
THANKS diff1 | diff2 | blob | history
doc/bison.texi diff1 | diff2 | blob | history
bison