aboutsummaryrefslogtreecommitdiffstats
path: root/lib/allocator.h
diff options
context:
space:
mode:
authorPaul Eggert2012-05-26 16:14:36 -0700
committerPaul Eggert2012-05-26 16:14:36 -0700
commitcaf8a9b2b301aba06735d403317b75b41df59bfe (patch)
treebfafb3cc0cf8a2f2394b4ed721e7c3d4891b78ab /lib/allocator.h
parentfe453991eafc32a890297a2003ac532b9f579f92 (diff)
downloademacs-caf8a9b2b301aba06735d403317b75b41df59bfe.tar.gz
emacs-caf8a9b2b301aba06735d403317b75b41df59bfe.zip
Merge from gnulib.
Fixes: debbugs:11527
Diffstat (limited to 'lib/allocator.h')
-rw-r--r--lib/allocator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/allocator.h b/lib/allocator.h
index b8de95c0f50..81c4aa20a45 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 Free Software Foundation, Inc. 3 Copyright (C) 2011-2012 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