Merge remote-tracking branch 'origin/maint'

[bison.git] / src / nullable.h

diff --git a/src/nullable.h b/src/nullable.h
index d5106c7e98c1b24ee46d8d94588193f8461fa6fd..63a8ae3f149248c6bf8f6bc8ad711604ec0c446b 100644 (file)
--- a/src/nullable.h
+++ b/src/nullable.h
@@ -1,22 +1,21 @@
 /* Part of the bison parser generator,
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 2000, 2002, 2009-2013 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef NULLABLE_H_
 # define NULLABLE_H_