nixpkgs/pkgs/servers/x11
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
..
quartz-wm
xorg Merge recent master into staging 2014-08-30 10:04:02 +02:00
xquartz Remove old comment, and delete confusing LaunchDaemon 2014-08-18 11:36:34 -04:00