diff options
author | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:32 +0200 |
---|---|---|
committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:32 +0200 |
commit | efc77ab6f5e8883fc38d8c6f75b6db54a0965c15 (patch) | |
tree | a34b12897145816f4ab7fbeb2fe6db437651e98e /lisp/org-clock.el | |
parent | 52fbfeb04b10aa78f24f339a352fe1161c0b37e4 (diff) |
Imported Upstream version 8.2.5h
Diffstat (limited to 'lisp/org-clock.el')
-rw-r--r-- | lisp/org-clock.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 3238c8c..fa50f9d 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1,6 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org-mode -;; Copyright (C) 2004-2013 Free Software Foundation, Inc. +;; Copyright (C) 2004-2014 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp @@ -424,7 +424,7 @@ to add an effort property.") "Hook run when stopping the current clock.") (defvar org-clock-cancel-hook nil - "Hook run when cancelling the current clock.") + "Hook run when canceling the current clock.") (defvar org-clock-goto-hook nil "Hook run when selecting the currently clocked-in entry.") (defvar org-clock-has-been-used nil @@ -441,7 +441,7 @@ to add an effort property.") (defvar org-clock-start-time "") (defvar org-clock-leftover-time nil - "If non-nil, user cancelled a clock; this is when leftover time started.") + "If non-nil, user canceled a clock; this is when leftover time started.") (defvar org-clock-effort "" "Effort estimate of the currently clocking task.") |