(w32_init_fringe, w32_reset_fringes): Restore to being conditional on

[gnu-emacs] / src / strftime.c

diff --git a/src/strftime.c b/src/strftime.c
index 4ca6023aa4191f1f85bf9f713bae10f8a1208736..f46b40f232acdc3b879b67701a646b962534d0f4 100644 (file)
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,2003
-             Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1491,3 +1491,6 @@ emacs_strftimeu (s, maxsize, format, tp, ut)
   return my_strftime (s, maxsize, format, tp, ut, 0);
 }
 #endif
+
+/* arch-tag: 662bc9c4-f8e2-41b6-bf96-b8346d0ce0d8
+   (do not change this comment) */