Merge branch 'maint'

* origin/maint:
  maint: post-release administrivia
  version 2.6.2
  NEWS: update.
  yacc: remove trailing end of line at end of file
  thanks: fix a contributor name
  gnulib: update
  tests: synch line -> syncline, for consistency
  tests: synclines: style changes
  tests: synclines: fix perl invocation
  regen
  c++: trailing end-of-lines in %parse-param
  tests: simplify

Conflicts:
	cfg.mk
	data/glr.cc
	data/yacc.c
	src/parse-gram.c
	src/parse-gram.h
	src/parse-gram.y
This commit is contained in:
Akim Demaille
2012-08-03 10:52:55 +02:00
12 changed files with 160 additions and 47 deletions

2
THANKS
View File

@@ -103,7 +103,7 @@ Sergei Steshenko sergstesh@yahoo.com
Shura debil_urod@ngs.ru
Stefano Lattarini stefano.lattarini@gmail.com
Steve Murphy murf@parsetree.com
Summum Bonum sum@geekhouse.org
Sum Wu sum@geekhouse.org
Thiru Ramakrishnan thiru.ramakrishnan@gmail.com
Tim Josling tej@melbpc.org.au
Tim Landscheidt tim@tim-landscheidt.de