Jonathan Glines 2784866ffd Merge branch 'master' into nitrogen. Added maintainer and license. ... Conflicts: pkgs/tools/X11/nitrogen/default.nix		2014-06-13 11:54:19 -06:00
..
default.nix	Merge branch 'master' into nitrogen. Added maintainer and license.	2014-06-13 11:54:19 -06:00