diff options
| author | John Wiegley | 2016-01-11 22:48:07 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-01-11 22:48:07 -0800 |
| commit | 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch) | |
| tree | fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /src/gmalloc.c | |
| parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
| parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) | |
| download | emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip | |
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
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 | ||