diff options
author | 2011-09-09 18:21:39 -0400 | |
---|---|---|
committer | 2011-09-09 18:21:39 -0400 | |
commit | e4899e7b9adbf74145f6530f6f57517f773e330c (patch) | |
tree | f8cc421a27739d5e2775478cac6707bd414949d1 /malloc/hooks.c | |
parent | Don't lock string streams in stream cleanup code (diff) | |
parent | Define ELFOSABI_GNU. (diff) | |
download | glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.tar.xz glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'malloc/hooks.c')
0 files changed, 0 insertions, 0 deletions