Skip to content
Commit 929b7bdc authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

Merge remote-tracking branch 'origin/master' into glibc-2.18 

Conflicts:
	pkgs/development/libraries/glibc/2.17/locales.nix
parents 101f62ad bc3c49ce
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