diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-08-08 14:32:34 +0200 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-08-08 14:32:34 +0200 |
commit | 83b6cfcaec887ad9296f08f97e86e0ec69f73255 (patch) | |
tree | 022b0fb7644e3fc23ee459a6aca7832c3da803c9 | |
parent | 131e7a679e310fdd1e54423892ce9db24594ffba (diff) | |
parent | ab8bfb846077e41c2e378f40faf6ad66eb33a526 (diff) | |
download | org-mode-83b6cfcaec887ad9296f08f97e86e0ec69f73255.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-clock.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 99479b2..656fb4c 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -362,13 +362,13 @@ play with them." "Format string for the total time cells." :group 'org-clock :version "24.1" - :type 'boolean) + :type 'string) (defcustom org-clock-file-time-cell-format "*%s*" "Format string for the file time cells." :group 'org-clock :version "24.1" - :type 'boolean) + :type 'string) (defcustom org-clock-clocked-in-display 'mode-line "When clocked in for a task, org-mode can display the current |