Merge from emacs--rel--22

[gnu-emacs] / nt / inc / langinfo.h

diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index 7215e1166987d9b361ac48fad2aa6e075dd0bf59..9685e4e8f072021c14419228edd0801677666d66 100644 (file)
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -1,11 +1,11 @@
 /* Replacement langinfo.h file for building GNU Emacs on Windows.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -59,3 +59,6 @@ enum {
 extern char *nl_langinfo (nl_item);
 
 #endif /* _LANGINFO_H */
+
+/* arch-tag: a8917b7c-fb2c-4685-902b-742d0f67661b
+   (do not change this comment) */