diff options
| author | Miles Bader | 2005-08-26 09:51:52 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-08-26 09:51:52 +0000 |
| commit | d4cccb140682cfa548a8658f905764ceb4a38cb2 (patch) | |
| tree | 5230af18ee25b37efed50fa38cac1eefb47d03fc /src/gmalloc.c | |
| parent | 5e10f34207ff594cd6570928bc0292a7b53297b8 (diff) | |
| parent | f3f01d5df3156fb408b43da0c670796c37ed084f (diff) | |
| download | emacs-d4cccb140682cfa548a8658f905764ceb4a38cb2.tar.gz emacs-d4cccb140682cfa548a8658f905764ceb4a38cb2.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 514-518)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 104-105)
- Update from CVS
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 08de77df0e0..55aedb7801b 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c | |||
| @@ -5,7 +5,8 @@ | |||
| 5 | /* The malloc headers and source files from the C library follow here. */ | 5 | /* The malloc headers and source files from the C library follow here. */ |
| 6 | 6 | ||
| 7 | /* Declarations for `malloc' and friends. | 7 | /* Declarations for `malloc' and friends. |
| 8 | Copyright 1990, 91, 92, 93, 95, 96, 99 Free Software Foundation, Inc. | 8 | Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004, |
| 9 | 2005 Free Software Foundation, Inc. | ||
| 9 | Written May 1989 by Mike Haertel. | 10 | Written May 1989 by Mike Haertel. |
| 10 | 11 | ||
| 11 | This library is free software; you can redistribute it and/or | 12 | This library is free software; you can redistribute it and/or |