diff options
| author | Vincent Belaïche | 2016-01-20 08:30:51 +0100 |
|---|---|---|
| committer | Vincent Belaïche | 2016-01-20 08:30:51 +0100 |
| commit | b895c72059521fec064ff27b4cfcfa4104081c4e (patch) | |
| tree | c1697f0e4d95d8c3556798f6c4c53c98a4714bd0 /lib/allocator.h | |
| parent | badcd38aa86ed7973f2be2743c405710973a0bdd (diff) | |
| parent | 1b76d9168336ede8976b980aeaed64ae2908501a (diff) | |
| download | emacs-b895c72059521fec064ff27b4cfcfa4104081c4e.tar.gz emacs-b895c72059521fec064ff27b4cfcfa4104081c4e.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lib/allocator.h')
| -rw-r--r-- | lib/allocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/allocator.h b/lib/allocator.h index c7c851f91f7..1f1eab6a033 100644 --- a/lib/allocator.h +++ b/lib/allocator.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Memory allocators such as malloc+free. | 1 | /* Memory allocators such as malloc+free. |
| 2 | 2 | ||
| 3 | Copyright (C) 2011-2015 Free Software Foundation, Inc. | 3 | Copyright (C) 2011-2016 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This program is free software: you can redistribute it and/or modify | 5 | This program is free software: you can redistribute it and/or modify |
| 6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |