]> git.saurik.com Git - bison.git/commit
projects / bison.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8427183 aaf63e4)
Merge branch 'maint'
authorAkim Demaille <akim@lrde.epita.fr>
Tue, 31 Jul 2012 09:50:18 +0000 (11:50 +0200)
committerAkim Demaille <akim@lrde.epita.fr>
Tue, 31 Jul 2012 10:03:55 +0000 (12:03 +0200)
commitcb9ec4fada480554cf47810fee736997d64e7427
tree9f36a0c5ee15ad02df0bf70f1ef30d6471181341tree | snapshot
parent84271837f686cc9bdf2d7483d4493f26b52d133dcommit | diff
parentaaf63e45b65d35bb506e431ffa8360f259ee393ccommit | diff
Merge branch 'maint'

* maint:
  use obstack_printf
  scanner: restore a missing start condition
  gnulib: update
  maint: post-release administrivia
  version 2.6.1
  gnulib: update
  maint: fix some syntax-check issues
  tests: do not depend on __cplusplus to decide for C++ or C output

Conflicts:
NEWS
bootstrap.conf
cfg.mk
lib/.gitignore
14 files changed:
NEWS diff1 | diff2 | blob | history
bootstrap.conf diff1 | diff2 | blob | history
cfg.mk diff1 | diff2 | blob | history
lib/.gitignore diff1 | diff2 | blob | history
m4/.gitignore diff1 | diff2 | blob | history
src/conflicts.c diff1 | diff2 | blob | history
src/muscle-tab.c diff1 | diff2 | blob | history
src/muscle-tab.h diff1 | diff2 | blob | history
src/output.c diff1 | diff2 | blob | history
src/print_graph.c diff1 | diff2 | blob | history
src/scan-code.l diff1 | diff2 | blob | history
src/scan-skel.l diff1 | diff2 | blob | history
src/system.h diff1 | diff2 | blob | history
tests/actions.at diff1 | diff2 | blob | history
bison