diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/alloc.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index 9a249e679b7..59d8f887c05 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6315,5 +6315,3 @@ The time is in seconds as a floating point value. */); | |||
| 6315 | #endif | 6315 | #endif |
| 6316 | } | 6316 | } |
| 6317 | 6317 | ||
| 6318 | /* arch-tag: 6695ca10-e3c5-4c2c-8bc3-ed26a7dda857 | ||
| 6319 | (do not change this comment) */ | ||