Merge from emacs-23

[gnu-emacs] / lisp / term / x-win.el

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index afb706ab97298cc68b558bad862162bff9cbd0e1..8d3ead687e67935d18d2162ea41603da00fae888 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,7 +1,7 @@
 ;;; x-win.el --- parse relevant switches and set up for X  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals, i18n