]> git.saurik.com Git - bison.git/commit
Merge remote-tracking branch 'origin/maint'
authorTheophile Ranquet <ranquet@lrde.epita.fr>
Thu, 6 Dec 2012 10:43:02 +0000 (11:43 +0100)
committerTheophile Ranquet <ranquet@lrde.epita.fr>
Thu, 6 Dec 2012 12:38:43 +0000 (13:38 +0100)
commitf3ead217b8636f623399e66bd937b1c51774d4af
tree074e97d4d5adbc914e312dbdb84c642d995355c4
parentd6dc4d36d1db744b060029254eaabaaa525a1c19
parent9960a6ae75842aa7836f39b59e82eef0319338bc
Merge remote-tracking branch 'origin/maint'

* origin/maint:
  misc: pacify the Tiny C Compiler
  cpp: make the check of Flex version portable
  misc: require getline
  c++: support wide strings for file names
  doc: document carets
  tests: enhance existing tests with carets
  errors: show carets
  getargs: add support for --flags/-f

Conflicts:
doc/bison.texi
m4/.gitignore
src/complain.c
src/flex-scanner.h
src/getargs.c
src/getargs.h
src/gram.c
src/main.c
tests/headers.at
21 files changed:
NEWS
THANKS
bootstrap.conf
data/location.cc
doc/bison.texi
lib/.gitignore
m4/.gitignore
src/complain.c
src/flex-scanner.h
src/getargs.c
src/getargs.h
src/gram.c
src/location.c
src/location.h
src/main.c
tests/actions.at
tests/conflicts.at
tests/input.at
tests/named-refs.at
tests/reduce.at
tests/regression.at