Skip to content
Commit 8cc0edae authored by Shea Levy's avatar Shea Levy
Browse files

Merge branch 'master' into stdenv-updates 

ssp is disabled for glibc-2.13 unconditionally
parents fd0a9f6b 9400646d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment