Mercurial > emacs
diff lisp/org/org-clock.el @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | a7740098b594 376148b31b5e |
children | ef719132ddfa |
line wrap: on
line diff
--- a/lisp/org/org-clock.el Fri Jan 14 16:06:17 2011 +0100 +++ b/lisp/org/org-clock.el Fri Jan 14 12:18:41 2011 -0500 @@ -1,6 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org>