Merge from mainline.

[gnu-emacs] / src / w32reg.c

diff --git a/src/w32reg.c b/src/w32reg.c
index 77667eb7dc9eabbfb91c1bbd9aff351b729f9d53..e1465be9e44df605e98bf064a3dcd4b6b37a8403 100644 (file)
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -1,6 +1,5 @@
 /* Emulate the X Resource Manager through the registry.
-   Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993-1994, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -26,7 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "blockinput.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #define REG_ROOT "SOFTWARE\\GNU\\Emacs"
 
@@ -162,5 +160,3 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
   return (w32_get_string_resource (name, class, REG_SZ));
 }
 
-/* arch-tag: 755fce25-42d7-4acb-874f-2fb42336823d
-   (do not change this comment) */