]> git.saurik.com Git - bison.git/commit
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Tue, 26 Jun 2012 15:13:36 +0000 (17:13 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Tue, 26 Jun 2012 15:14:36 +0000 (17:14 +0200)
commit22b081deb7ab1d0ec7a279e5213fa7fdc2c85207
tree7e6e572b565e1d4b9cbd1908244385a0543c5c83
parent297e263a0050959e0fd139ad66e71383fc9ac4db
parent9bcffa0c13d1abee13433f14cdb785cbb960425c
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  maint: use *.texi.

Conflicts:
doc/Makefile.am
examples/calc++/Makefile.am
doc/bison.texi
doc/bison.x
doc/local.mk
examples/local.mk