Merge branch 'maint'

2013-09-08 18:28:48 +02:00 · 2013-09-08 18:28:48 +02:00 · a0f40bdfa3
parent 3f27d102bd 2c173d34a2
commit a0f40bdfa3
1 changed files with 2 additions and 0 deletions
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@ -370,6 +370,8 @@ VALUE can be `on', `off', or `pause'."
      (message "%d minute(s) %d seconds left before next time out"
 	       rmins rsecs))))

+(defvar org-clock-sound)
+
 ;;;###autoload
 (defun org-timer-set-timer (&optional opt)
  "Prompt for a duration and set a timer.