Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
applications	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
build-support	Add Debian 7.0	2013-05-07 11:19:46 +02:00
data	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
desktops	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
development	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
games	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
lib	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
misc	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
os-specific	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
servers	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +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	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
top-level	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00