Skip to content
Commit c72ed048 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge 'master' and 'stdenv-fixes' into x-updates 

Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
parents 81b7f5fe ccda1487 0f8a1b29
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