Vladimír Čunát b770365574 ReRevert Merge x-updates into master ... This reverts commit ec3965d8d0. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix		2013-05-29 23:25:02 +02:00
..
applications	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
build-support	fetchsvn: Allow setting the name of the output	2013-05-26 11:58:01 -04:00
data	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
desktops	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
development	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
games	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
lib	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
misc	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
os-specific	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
servers	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
shells	Fix another maintainers attribute	2013-05-21 09:27:35 +02:00
stdenv
test
tools	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
top-level	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00