Merge emacs-25 into master (using imerge)

[gnu-emacs] / lib / fpending.c

diff --git a/lib/fpending.c b/lib/fpending.c
index 31aba1ada3d746767080737f3fd50f3161616dd0..c4b4a5196113093f4b968d68bc91fcb125ec6a33 100644 (file)
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -1,5 +1,5 @@
 /* fpending.c -- return the number of pending output bytes on a stream
-   Copyright (C) 2000, 2004, 2006-2007, 2009-2014 Free Software Foundation,
+   Copyright (C) 2000, 2004, 2006-2007, 2009-2015 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify