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

Merge branch 'x-updates' into stdenv-updates 

Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
parents ed507d70 0fc3e281
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