diff options
| author | DJ Delorie <dj@delorie.com> | 2017-01-11 15:09:55 -0500 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2017-01-11 15:09:55 -0500 |
| commit | 4250ac7f60baa1977ea646610e35a2368ce6a56a (patch) | |
| tree | 8fb3b485156808397678e4c7922ace0a511ee00d /malloc/malloc.c | |
| parent | ba163b353ee76e9dad24246cb07e47a6840cfbae (diff) | |
| parent | 6a1cefac196f45d766027c97a6c8c44459c9cccd (diff) | |
| download | glibc-4250ac7f60baa1977ea646610e35a2368ce6a56a.zip glibc-4250ac7f60baa1977ea646610e35a2368ce6a56a.tar.gz glibc-4250ac7f60baa1977ea646610e35a2368ce6a56a.tar.bz2 | |
Merge branch 'master' into dj/malloc-tcache
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index e57d0cd..1621fb3 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1,5 +1,5 @@ /* Malloc implementation for multiple threads without lock contention. - Copyright (C) 1996-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Wolfram Gloger <wg@malloc.de> and Doug Lea <dl@cs.oswego.edu>, 2001. |