Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat ... See #490 discussion. This reverts commit 1278859d31, reversing changes made to 0c020c98f9. Conflicts: pkgs/desktops/xfce/core/xfce4-session.nix (take master) pkgs/lib/misc.nix (auto)		2013-05-09 14:03:35 +02:00
..
default.nix	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
default.upstream	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00