]> git.saurik.com Git - bison.git/commit - tests/conflicts.at
Merge branch 'maint'
authorAkim Demaille <akim@lrde.epita.fr>
Wed, 26 Sep 2012 12:35:47 +0000 (14:35 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Wed, 26 Sep 2012 12:51:11 +0000 (14:51 +0200)
commit11b192127cac086338bfaa43f3bab3acda8e3a20
tree3e5f718eca75627a5035b3d7c3ee896a56610a13
parent37cfa1195debf4261cac67fb2875d04da589a88f
parentbd52638008b361db9b368923a976a08d934efcd7
Merge branch 'maint'

* maint:
  warnings: introduce -Wdeprecated in the usage info
  errors: prefix the output with "error: "
  errors: indent "invalid value for %define" context
  errors: indent "%define var" redefinition context
  errors: indent "symbol redeclaration" context
  errors: indent "result type clash" error context

Conflicts:
src/complain.c
src/muscle-tab.c
src/reader.c
src/symtab.c
tests/conflicts.at
tests/input.at
tests/named-refs.at
tests/output.at
tests/skeletons.at
15 files changed:
NEWS
THANKS
src/complain.c
src/complain.h
src/getargs.c
src/muscle-tab.c
src/reader.c
src/symtab.c
tests/conflicts.at
tests/glr-regression.at
tests/input.at
tests/named-refs.at
tests/output.at
tests/regression.at
tests/skeletons.at