]> git.saurik.com Git - bison.git/commit - src/reader.h
Merge remote-tracking branch 'origin/maint'
authorAkim Demaille <akim@lrde.epita.fr>
Fri, 26 Oct 2012 14:50:26 +0000 (16:50 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Fri, 26 Oct 2012 14:58:55 +0000 (16:58 +0200)
commitd0a304384f4207bdf7f8b1038c2226c312f5e954
tree1362b308c1b3ae17301c56f53e62fdca13e5e1a7
parent6b1cbda1b9e0e8f29c0a6e4e44ce2d5a2aee974f
parent71cb558dfe0f9c80e697308a5084de3b9926ee9c
Merge remote-tracking branch 'origin/maint'

* origin/maint: (46 commits)
  doc: minor style change
  maint: use gendocs's new -I option
  regen
  yacc.c: do not define location support when not using locations
  maint: be compilable with GCC 4.0
  tests: address a warning from GCC 4.4
  tests: don't use options that Clang does not support
  tests: restore the tests on -Werror
  regen
  parse-gram: update the Bison interface
  fix comment
  maint: post-release administrivia
  version 2.6.4
  regen
  2.6.4: botched 2.6.3
  maint: post-release administrivia
  version 2.6.3
  gnulib: update
  tests: check %no-lines
  NEWS: warnings with clang
  ...

Conflicts:
NEWS
TODO
data/c.m4
data/java.m4
doc/Makefile.am
src/getargs.c
src/getargs.h
src/output.c
src/parse-gram.c
src/parse-gram.h
src/parse-gram.y
src/reader.h
17 files changed:
NEWS
README-hacking
TODO
cfg.mk
configure.ac
data/c.m4
data/java.m4
data/yacc.c
doc/bison.texi
doc/local.mk
gnulib
src/location.h
src/parse-gram.y
src/print_graph.c
src/reader.h
tests/local.at
tests/output.at