diff options
| author | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
| commit | cf206f28eb11467aed7f5e03f3e4df7724fd98d2 (patch) | |
| tree | 2f5695e6a774a918874b82c286f140abd052d860 /src/atimer.h | |
| parent | 5a876cd5f810b611f78dd4cf7a1673bffeea19a9 (diff) | |
| parent | c893016b07f33eb8d56e1011245fe59a67cb4ee0 (diff) | |
| download | emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.tar.gz emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.zip | |
Merge from mainline.
Diffstat (limited to 'src/atimer.h')
| -rw-r--r-- | src/atimer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/atimer.h b/src/atimer.h index 5ea1197e66d..fd354caf54d 100644 --- a/src/atimer.h +++ b/src/atimer.h | |||
| @@ -43,7 +43,7 @@ enum atimer_type | |||
| 43 | /* Timer is ripe at now plus an offset. */ | 43 | /* Timer is ripe at now plus an offset. */ |
| 44 | ATIMER_RELATIVE, | 44 | ATIMER_RELATIVE, |
| 45 | 45 | ||
| 46 | /* Timer runs continously. */ | 46 | /* Timer runs continuously. */ |
| 47 | ATIMER_CONTINUOUS | 47 | ATIMER_CONTINUOUS |
| 48 | }; | 48 | }; |
| 49 | 49 | ||