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/gmalloc.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 7a5e95c7435..5237432872d 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c | |||
| @@ -2171,5 +2171,3 @@ mprobe (__ptr_t ptr) | |||
| 2171 | 2171 | ||
| 2172 | #endif /* GC_MCHECK */ | 2172 | #endif /* GC_MCHECK */ |
| 2173 | 2173 | ||
| 2174 | /* arch-tag: 93dce5c0-f49a-41b5-86b1-f91c4169c02e | ||
| 2175 | (do not change this comment) */ | ||