Skip to content
Commit 2784866f authored by Jonathan Glines's avatar Jonathan Glines
Browse files

Merge branch 'master' into nitrogen. Added maintainer and license. 

Conflicts:
	pkgs/tools/X11/nitrogen/default.nix
parents c977673b 13befa39
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