nixpkgs/pkgs/servers/x11
Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
..
xorg Merge branch 'master' into x-updates 2013-04-24 06:29:09 +00:00