diff lisp/generic-x.el @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents a3e1f7134e6e 376148b31b5e
children ef719132ddfa
line wrap: on
line diff
--- a/lisp/generic-x.el	Fri Jan 14 16:06:17 2011 +0100
+++ b/lisp/generic-x.el	Fri Jan 14 12:18:41 2011 -0500
@@ -1,7 +1,7 @@
 ;;; generic-x.el --- A collection of generic modes
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Tue Oct 08 1996