nixpkgs/pkgs/servers/x11
Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
..
quartz-wm get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
xorg Merge branch 'staging' into v/modular 2014-08-31 12:23:18 +02:00
xquartz Remove old comment, and delete confusing LaunchDaemon 2014-08-18 11:36:34 -04:00