summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-10-27 12:04:29 -0600
committerEric Schulte <schulte.eric@gmail.com>2010-10-27 12:04:29 -0600
commite4530f52da3efc40f429189dd33262f6136469d0 (patch)
treeb3de3a96ae95363e5b112ae9597269a6b14296ae
parent859a1b277e9e111d617c093da2cd0974655de02e (diff)
parentc0c2f3896b079b4bfa846f8193f4ef5a2176f0ca (diff)
downloadorg-mode-e4530f52da3efc40f429189dd33262f6136469d0.tar.gz
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
-rw-r--r--doc/org.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 17a5a13..54f52e2 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -263,6 +263,7 @@ Dates and times
* Resolving idle time:: Resolving time if you've been idle
* Effort estimates:: Planning work effort in advance
* Relative timer:: Notes with a running timer
+* Countdown timer:: Starting a countdown timer for a task
Creating timestamps
@@ -5012,6 +5013,7 @@ is used in a much wider sense.
* Resolving idle time:: Resolving time if you've been idle
* Effort estimates:: Planning work effort in advance
* Relative timer:: Notes with a running timer
+* Countdown timer:: Starting a countdown timer for a task
@end menu