diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lib/allocator.h | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
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 81c4aa20a45..b71fbbbb53c 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-2012 Free Software Foundation, Inc. | 3 | Copyright (C) 2011-2013 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 |