diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
commit | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch) | |
tree | dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /m4/strftime.m4 | |
parent | 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff) | |
parent | 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff) | |
download | emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.bz2 emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip |
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Diffstat (limited to 'm4/strftime.m4')
-rw-r--r-- | m4/strftime.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/m4/strftime.m4 b/m4/strftime.m4 index 9598e7272ee..b708b1b7dc5 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,6 +1,7 @@ # serial 33 -# Copyright (C) 1996-1997, 1999-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2007, 2009-2017 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, |