Vladimír Čunát 031baae714 Merge branch 'staging' into v/modular ... Conflicts (as in p/modular-stdenv): pkgs/stdenv/linux/default.nix		2014-08-30 08:33:10 +02:00
..
applications	Merge branch 'staging' into v/modular	2014-08-30 08:33:10 +02:00
build-support	WIP: getting good	2014-08-27 01:14:09 +02:00
data	man-pages: Update to 3.70	2014-08-19 11:46:08 +02:00
desktops	Merge 'staging'	2014-08-24 10:50:22 +02:00
development	Merge branch 'staging' into v/modular	2014-08-30 08:33:10 +02:00
games	update minecraft-server to 1.7.10	2014-08-18 18:51:51 -07:00
misc	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
os-specific	mutiout: make it builtin	2014-08-30 08:27:43 +02:00
servers	mutiout: make it builtin	2014-08-30 08:27:43 +02:00
shells	WIP: getting good	2014-08-27 01:14:09 +02:00
stdenv	Merge branch 'staging' into v/modular	2014-08-30 08:33:10 +02:00
test
tools	mutiout: make it builtin	2014-08-30 08:27:43 +02:00
top-level	WIP: getting good	2014-08-27 01:14:09 +02:00