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

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

author	Akim Demaille <akim@lrde.epita.fr>
	Fri, 14 Dec 2012 12:56:11 +0000 (13:56 +0100)
committer	Akim Demaille <akim@lrde.epita.fr>
	Fri, 14 Dec 2012 12:58:04 +0000 (13:58 +0100)
commit	b9278c7d174c1be5d7482343c5e433f428657ed0
tree	90b6cb9385cd4cb10505f4e0b799ee3a2c7448a2	tree \| snapshot
parent	e96b1b2c452d62d0fe9cef4338c882db0b7d0691	commit \| diff
parent	2bd435c36c0dfdefb07cef05dec851ec75bab20b	commit \| diff

Merge branch 'origin/maint'

* origin/maint:
  maint: credit Wojciech Polak
  maint: post-release administrivia
  version 2.7
  yacc.c: scope reduction
  tests: C90 compliance
  fix C90 compliance
  glr.c: scope reduction
  gnulib: update

Conflicts:
NEWS
gnulib
src/scan-gram.l
src/system.h

NEWS	diff1 \|	diff2 \|	blob \| history
THANKS	diff1 \|	diff2 \|	blob \| history
data/glr.c	diff1 \|	diff2 \|	blob \| history
data/yacc.c	diff1 \|	diff2 \|	blob \| history
src/ielr.c	diff1 \|	diff2 \|	blob \| history
src/scan-gram.l	diff1 \|	diff2 \|	blob \| history
src/system.h	diff1 \|	diff2 \|	blob \| history
tests/actions.at	diff1 \|	diff2 \|	blob \| history
tests/glr-regression.at	diff1 \|	diff2 \|	blob \| history

bison

RSS Atom

NEWS	diff1 \|	diff2 \|	blob \| history
THANKS	diff1 \|	diff2 \|	blob \| history
data/glr.c	diff1 \|	diff2 \|	blob \| history
data/yacc.c	diff1 \|	diff2 \|	blob \| history
src/ielr.c	diff1 \|	diff2 \|	blob \| history
src/scan-gram.l	diff1 \|	diff2 \|	blob \| history
src/system.h	diff1 \|	diff2 \|	blob \| history
tests/actions.at	diff1 \|	diff2 \|	blob \| history
tests/glr-regression.at	diff1 \|	diff2 \|	blob \| history