summaryrefslogtreecommitdiff
path: root/src/ielr.c
diff options
context:
space:
mode:
authorAkim Demaille <akim@lrde.epita.fr>2015-01-05 13:51:30 +0100
committerAkim Demaille <akim@lrde.epita.fr>2015-01-05 13:51:30 +0100
commit13e294ee552428507327e9fd085b46d594e434c5 (patch)
treeb2b590ee6b282ff1f74375c51391c224d0dd7955 /src/ielr.c
parent8044fda634bafbe9cc52aaacdeee1c10b55f0ac3 (diff)
parenta16074bb09740ac84c1d27bbf6733f4a054100ba (diff)
downloadbison-13e294ee552428507327e9fd085b46d594e434c5.tar.gz
Merge remote-tracking branch 'origin/maint'
* origin/maint: build: don't try to generate docs when cross-compiling package: fix a reporter's name %union: fix the support for named %union package: bump to 2015 flex: don't trust YY_USER_INIT yacc.c: fix broken union when api.value.type=union and %defines are used doc: fix missing xref gnulib: update location: remove some ugly debugging code traces build: use abort to pacify compiler errors package: bump to 2014 doc: specify documentation encoding
Diffstat (limited to 'src/ielr.c')
-rw-r--r--src/ielr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ielr.c b/src/ielr.c
index 56df0f42..60754b1a 100644
--- a/src/ielr.c
+++ b/src/ielr.c
@@ -1,6 +1,6 @@
/* IELR main implementation.
- Copyright (C) 2009-2013 Free Software Foundation, Inc.
+ Copyright (C) 2009-2015 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.