diff src/atimer.h @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 2bc9a0c04c87 376148b31b5e
children ef719132ddfa
line wrap: on
line diff
--- a/src/atimer.h	Fri Jan 14 16:06:17 2011 +0100
+++ b/src/atimer.h	Fri Jan 14 12:18:41 2011 -0500
@@ -1,6 +1,6 @@
 /* Asynchronous timers.
    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.