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
..
applications	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
build-support	Add Fedora 18	2013-05-08 14:08:59 +02:00
data	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
desktops	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
development	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
games	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
lib	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
misc	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
os-specific	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
servers	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
shells	bash-completion: update to version 2.1	2013-04-10 17:39:09 +02:00
stdenv	mkDerivation: Allow direct access to passthru	2013-05-03 09:07:42 -04:00
test
tools	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00
top-level	Revert Merge x-updates into master due to mesa bloat	2013-05-09 14:03:35 +02:00