diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-08-03 10:52:55 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-08-03 11:04:29 +0200 |
| commit | c85541913b99f841de090aacf626bb8f52f7f727 (patch) | |
| tree | b18183666a1902df237c066269f6d027a03a14bb /cfg.mk | |
| parent | 95dbea81032ba903c0cb70dde1cee2bd8744fa8e (diff) | |
| parent | 933ec5449fc9b8a831d6afe67535d2c2bdc528d2 (diff) | |
| download | bison-c85541913b99f841de090aacf626bb8f52f7f727.tar.gz | |
Merge branch 'maint'
* origin/maint:
maint: post-release administrivia
version 2.6.2
NEWS: update.
yacc: remove trailing end of line at end of file
thanks: fix a contributor name
gnulib: update
tests: synch line -> syncline, for consistency
tests: synclines: style changes
tests: synclines: fix perl invocation
regen
c++: trailing end-of-lines in %parse-param
tests: simplify
Conflicts:
cfg.mk
data/glr.cc
data/yacc.c
src/parse-gram.c
src/parse-gram.h
src/parse-gram.y
Diffstat (limited to 'cfg.mk')
| -rw-r--r-- | cfg.mk | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -64,7 +64,6 @@ $(call exclude, \ prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$ \ prohibit_always-defined_macros+=?|^tests/regression.at$$ \ prohibit_defined_have_decl_tests=?|^lib/timevar.c$$ \ - prohibit_empty_lines_at_EOF=^src/parse-gram.h$$ \ prohibit_magic_number_exit=^doc/bison.texi$$ \ prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$ \ prohibit_strcmp=^doc/bison\.texi$$ \ |