diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/atimer.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/atimer.c')
| -rw-r--r-- | src/atimer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/atimer.c b/src/atimer.c index 5ecf45d0bf0..aff506a9f70 100644 --- a/src/atimer.c +++ b/src/atimer.c @@ -444,5 +444,3 @@ init_atimer (void) signal (SIGALRM, alarm_signal_handler); } -/* arch-tag: e6308261-eec6-404b-89fb-6e5909518d70 - (do not change this comment) */ |