Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/stdenv/generic/default.nix		2014-11-06 10:16:39 +01:00
..
quartz-wm	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00
xorg	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
xquartz	Remove old comment, and delete confusing LaunchDaemon	2014-08-18 11:36:34 -04:00