Merge from origin/emacs-24

[gnu-emacs] / lib / allocator.h

diff --git a/lib/allocator.h b/lib/allocator.h
index b8de95c0f50c8d79dbb466ff0ea5e24a3e87b58e..c7c851f91f70a412e46501984e7ea96cd0903cc0 100644 (file)
--- a/lib/allocator.h
+++ b/lib/allocator.h
@@ -1,6 +1,6 @@
 /* Memory allocators such as malloc+free.
 
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by