X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/647c7c9a726c4f6d29cc8f932e434555f1d0aed8..7e09ef09a479731d01b1ca46e94ddadd73ac98e3:/ChangeLog diff --git a/ChangeLog b/ChangeLog index 73bac439d2..343a58536e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-01-01 Paul Eggert + Update copyright year to 2015 + Run admin/update-copyright. + Merge from gnulib, incorporating: 2015-01-01 version-etc: new year @@ -14546,7 +14549,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2014 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc. This file is part of GNU Emacs.