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

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

projects / bison.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 595284e c9d5bcc)

author	Akim Demaille <akim@lrde.epita.fr>
	Mon, 1 Oct 2012 12:00:23 +0000 (14:00 +0200)
committer	Akim Demaille <akim@lrde.epita.fr>
	Mon, 1 Oct 2012 12:10:33 +0000 (14:10 +0200)
commit	fa98bb3233f7f291d8efa2565288bc0597f92063
tree	bd8ff79cf09f0e1e94f8806ae92984b52931493d	tree \| snapshot
parent	595284e9d0277517bac8f3fc7bcdd529d97aa6f9	commit \| diff
parent	c9d5bcc9389ccea013b23eb095dc4a637fadbd42	commit \| diff

Merge remote-tracking branch 'origin/maint'

* origin/maint:
headers: move CPP guards into YY_*_INCLUDED to avoid collisions
minor changes.

Conflicts:
doc/bison.texi
tests/headers.at

NEWS	diff1 \|	diff2 \|	blob \| history
data/c.m4	diff1 \|	diff2 \|	blob \| history
doc/bison.texi	diff1 \|	diff2 \|	blob \| history
tests/headers.at	diff1 \|	diff2 \|	blob \| history

bison