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
..
applications	Merge pull request #2807 from cstrahan/vim-update	2014-06-03 20:34:18 -05:00
build-support	Merge pull request #2767 from jwiegley/hscolour	2014-06-03 10:50:04 +02:00
data	Merge pull request #2741 from bergey/nafees	2014-05-28 08:37:29 +02:00
desktops	nautilus-sendto: add to gnome 3.10	2014-05-29 12:38:50 +02:00
development	Merge pull request #2648 from jbedo/master	2014-06-03 20:37:56 -05:00
games	Oops, typespeed branch got merged somehow. Removed.	2014-06-13 11:37:05 -06:00
misc	Merge pull request #2785 from Fuuzetsu/ppsspp	2014-06-03 20:32:51 -05:00
os-specific	disk-indicator: Add package	2014-05-30 21:24:46 +02:00
servers	Merge pull request #2802 from Fuuzetsu/mpd	2014-06-03 20:33:11 -05:00
shells
stdenv	Change stdenv on darwin to not set NIX_ENFORCE_PURITY	2014-05-29 02:43:10 -05:00
test
tools	Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen	2014-06-13 11:41:40 -06:00
top-level	Nitrogen build working. Missing custom icons in GUI.	2014-06-13 11:37:05 -06:00