git.saurik.com Git - bison.git/commit

]> git.saurik.com Git - bison.git/commit - doc/local.mk

author	Akim Demaille <akim@lrde.epita.fr>
	Tue, 26 Jun 2012 15:13:36 +0000 (17:13 +0200)
committer	Akim Demaille <akim@lrde.epita.fr>
	Tue, 26 Jun 2012 15:14:36 +0000 (17:14 +0200)
commit	22b081deb7ab1d0ec7a279e5213fa7fdc2c85207
tree	7e6e572b565e1d4b9cbd1908244385a0543c5c83	tree \| snapshot
parent	297e263a0050959e0fd139ad66e71383fc9ac4db	commit \| diff
parent	9bcffa0c13d1abee13433f14cdb785cbb960425c	commit \| diff

Merge remote-tracking branch 'origin/maint'

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

Conflicts:
doc/Makefile.am
examples/calc++/Makefile.am

bison