nixpkgs/pkgs/servers/x11
Vladimír Čunát 74488e2b58 Merge branch 'x-updates' into stdenv-updates
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
..
xorg Merge branch 'x-updates' into stdenv-updates 2013-09-02 15:44:57 +02:00