]> git.saurik.com Git - bison.git/commit
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Tue, 5 Jun 2012 12:06:08 +0000 (14:06 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Tue, 5 Jun 2012 12:07:43 +0000 (14:07 +0200)
commit527187137ac6314b86246bca71cb996203b4fa10
treec21844210f2145922cb75739bdadbe487ae4c6d9
parent398c298c8814ff5cc9c1fafc9cfaa26e331b4f79
parentdfaac272423687b604f5eb7c801cddadc231804c
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  version 2.5.1
  NEWS: prepare for 2.5.1.
  maint: update release procedure
  maint: fix comment typos
  maint: post-release administrivia

Conflicts:
NEWS
.prev-version
ChangeLog-2012
NEWS
README-hacking
bootstrap.conf
build-aux/.gitignore
data/yacc.c
src/parse-gram.c
tests/existing.at
tests/local.at