diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-27 22:24:19 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-27 22:24:47 -0800 |
| commit | 39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4 (patch) | |
| tree | e3331217ed3d9fab50de7d92fa1f2074138ac407 /lib/strtol.c | |
| parent | 0cdd599c54aeda36e7e0696b2f90d2c286153a1d (diff) | |
| download | emacs-39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4.tar.gz | |
Merge from gnulib and try to repair bad merge
This attempts to repair problems introduced by the bad merge
5491fd1098d27b3ba3db054076b9ab60fb3558dc. The easiest way for me
to fix the badly-merged gnulib files was to run
'admin/merge-gnulib', so I did that, which also imported the
following changes:
* build-aux/update-copyright, m4/gnulib.m4:
Update from gnulib, incorporating:
2015-01-15 time: port to MinGW32 3.21
2015-01-15 update-copyright: apply to self
2015-01-11 update-copyright: recognize groff's \(co marker
Diffstat (limited to 'lib/strtol.c')
| -rw-r--r-- | lib/strtol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/strtol.c b/lib/strtol.c index 56b38af224e..1bc143985db 100644 --- a/lib/strtol.c +++ b/lib/strtol.c @@ -1,7 +1,7 @@ /* Convert string representation of a number into an integer value. - Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2015 Free - Software Foundation, Inc. + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2015 Free Software + Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. |