]> git.saurik.com Git - bison.git/commit - data/java.m4
Merge branch 'maint'
authorAkim Demaille <akim@lrde.epita.fr>
Fri, 12 Oct 2012 10:39:52 +0000 (12:39 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Fri, 12 Oct 2012 10:49:57 +0000 (12:49 +0200)
commitf6b561d9f9cbc6fc95bbb86518372a5cb52f45a6
treefafb03fccf5235137a98086190867e1564ead002
parent23d13411c85d3a8705f9507219f61eddea57a218
parente94ca80bbb9e2fe181a0c5376403113c4d3bc153
Merge branch 'maint'

* origin/maint:
  tests: check %no-lines
  tests: minor simplification
  graphs: stylistic changes.
  graphs: minor style changes
  graphs: show reductions
  graphs: style: prefix state number with "state"
  graphs: style: use left justification for states
  graphs: style: prefix rules and change shapes
  obstack: import obstack_finish0 from master
  c++: api.location.type
  muscles: a function for backward compatibility
  maint: more macros

Conflicts:
data/glr.cc
data/java.m4
data/lalr1.cc
doc/bison.texi
src/muscle-tab.c
src/system.h
tests/calc.at
13 files changed:
NEWS
data/c++.m4
data/glr.cc
data/java.m4
data/lalr1.cc
doc/bison.texi
src/muscle-tab.c
src/print_graph.c
src/system.h
tests/calc.at
tests/headers.at
tests/java.at
tests/local.at