]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Merge branch 'master' into dj/malloc
authorDJ Delorie <dj@delorie.com>
Thu, 12 May 2016 23:55:18 +0000 (19:55 -0400)
committerDJ Delorie <dj@delorie.com>
Thu, 12 May 2016 23:55:18 +0000 (19:55 -0400)
1  2 
malloc/Makefile

diff --cc malloc/Makefile
Simple merge