]> git.saurik.com Git - bison.git/commit - src/reader.c
Merge remote-tracking branch 'origin/maint'
authorTheophile Ranquet <ranquet@lrde.epita.fr>
Mon, 10 Dec 2012 16:01:55 +0000 (17:01 +0100)
committerTheophile Ranquet <ranquet@lrde.epita.fr>
Mon, 10 Dec 2012 16:01:55 +0000 (17:01 +0100)
commit0906b12cd56f9777fb684b8a257a0e56c090a93c
treea30ecfbd9bc592fcfd88762b9507f6ca8b7eb7da
parentf3ead217b8636f623399e66bd937b1c51774d4af
parentd4fe9e88f33f622f86907feb7b2690d354d92945
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  news: prepare for forthcoming release
  doc: explain how mid-rule actions are translated
  error: use better locations for unused midrule values
  doc: various minor improvements and fixes
  tests: ignore more useless compiler warnings
  tests: be robust to C being compiled with a C++11 compiler
  build: beware of Clang++ not supporting POSIXLY_CORRECT
  maint: post-release administrivia
  version 2.6.90
  build: fix syntax-check error.
  cpp: simplify the Flex version checking macro
  news: improve the carets example and fix a typo
  cpp: improve the Flex version checking macro
  carets: improve the code
  maint: update news
  build: keep -Wmissing-declarations and -Wmissing-prototypes for modern GCCs
  build: drop -Wcast-qual
  gnulib: update

Conflicts:
NEWS
doc/Makefile.am
doc/bison.texi
gnulib
src/reader.c
tests/actions.at
tests/atlocal.in
tests/input.at
14 files changed:
NEWS
cfg.mk
configure.ac
doc/bison.texi
m4/c-working.m4
m4/cxx.m4
src/flex-scanner.h
src/location.c
src/reader.c
tests/actions.at
tests/atlocal.in
tests/glr-regression.at
tests/input.at
tests/local.at