Jonathan Glines c977673bb5 Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen ... Conflicts: pkgs/tools/X11/nitrogen/default.nix		2014-06-13 11:41:40 -06:00
..
default.nix	Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen	2014-06-13 11:41:40 -06:00