Merge emacs-25 into master (using imerge)

[gnu-emacs] / lib / getopt1.c

diff --git a/lib/getopt1.c b/lib/getopt1.c
index fb2a8f5a7b1a7b874c0b6eefe95eafb8b936589e..2b1feb6eadb7277139f5f633be149db91567a520 100644 (file)
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2012 Free Software
+   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2015 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.