diff options
| author | K. Handa | 2016-01-14 21:55:43 +0900 |
|---|---|---|
| committer | K. Handa | 2016-01-14 21:55:43 +0900 |
| commit | 641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch) | |
| tree | 85e524c8d12caca29588382205f536b2008edc55 /src/gmalloc.c | |
| parent | 9835757013569673854b692ccbb58bfb3c3ed1f7 (diff) | |
| parent | ee83b77f5ddede0fed518d0c23cf0ae38ce5b745 (diff) | |
| download | emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.gz emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 90a52a1c728..00b83641319 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Declarations for `malloc' and friends. | 1 | /* Declarations for `malloc' and friends. |
| 2 | Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2015 Free | 2 | Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2016 Free |
| 3 | Software Foundation, Inc. | 3 | Software Foundation, Inc. |
| 4 | Written May 1989 by Mike Haertel. | 4 | Written May 1989 by Mike Haertel. |
| 5 | 5 | ||