Vladimír Čunát 9b02635faa Merge recent master into x-updates ... Hydra: ?compare=1138350 Conflicts: nixos/modules/services/x11/desktop-managers/default.nix Two imports were added independently on the same line. I split it as well, as it was very long now.		2014-07-21 12:05:57 +02:00
..
default.nix	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
e17.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
e18.nix	e18: enlightenment desktop manager version 18	2014-07-17 23:00:38 +02:00
gnome3.nix	nautilus-sendto: new package	2014-05-28 17:27:48 +02:00
kde4.nix	Remove KDE 4.11	2014-04-21 18:13:17 +02:00
kde4_next.nix	kde: Allow kde_next as a desktop environment	2014-06-22 19:28:18 +02:00
none.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
xbmc.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
xfce.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
xterm.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00