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 | 1dd956c466d1828e494b01013d61564ac0e53c29 (patch) | |
| tree | 91609e9e36b3ed38b1147bf842eb57dfbe3dc8a2 /src/gmalloc.c | |
| parent | 3ee791f8360773d3df697e738701600a230f5998 (diff) | |
| parent | d187559dd7c481e735c14dec9c822fc9b8e642a6 (diff) | |
| download | emacs-1dd956c466d1828e494b01013d61564ac0e53c29.tar.gz | |
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) #endif /* GC_MCHECK */ -/* arch-tag: 93dce5c0-f49a-41b5-86b1-f91c4169c02e - (do not change this comment) */ |