diff options
| author | Paul Eggert | 2016-01-01 01:12:52 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-01-18 22:29:10 -0800 |
| commit | cd19641ed3236c8d51b882f867c58e719782dbfc (patch) | |
| tree | 51f1fd5f8951402894b9dfd5ae062ca12032c720 /lib/allocator.h | |
| parent | 394c81c092829cf82c41b859b3a246952854056b (diff) | |
| download | emacs-cd19641ed3236c8d51b882f867c58e719782dbfc.tar.gz emacs-cd19641ed3236c8d51b882f867c58e719782dbfc.zip | |
Merge from gnulib
This mostly just updates copyright dates of gnulib files.
It also updates to the latest version of texinfo.tex.
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 |