Skip to content
Commit 8271de67 authored by Michael Raskin's avatar Michael Raskin
Browse files

Merge remote-tracking branch 'upstream/master' into x-updates 

Conflicts:
	pkgs/misc/emulators/wine/default.nix
parents 7db886fd 604652f1
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