Merge from emacs-23

[gnu-emacs] / src / xrdb.c

diff --git a/src/xrdb.c b/src/xrdb.c
index 8356ab8a45cb070a28f486ccec7808efe137df18..5a46028556ef2d485bb796389e5befaba38d6152 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -1,6 +1,6 @@
 /* Deal with the X Resource Manager.
    Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 Author: Joseph Arceneaux
 Created: 4/90