Merge emacs-25 into master (using imerge)

[gnu-emacs] / lib / gettimeofday.c

diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index ad65c6da8be7b44c75e9ff9ed3056be776dd267d..e0e2e696d044b8375c13a2381c5d6467e2ad4c2d 100644 (file)
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -1,6 +1,6 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
 
    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