Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: pkgs/tools/networking/network-manager/default.nix		2013-01-03 13:44:47 +01:00
..
applications	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00
build-support	More specific tracing of a relatively tricky replace once; account for default.nix being present everywhere.	2012-12-22 14:14:48 +04:00
data
desktops
development	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00
games	scid: New package, version 4.3.	2012-12-12 12:36:20 +01:00
lib	Simplify lib.typeOf	2012-12-31 13:59:30 -05:00
misc	Wine: update to 1.5.20	2012-12-22 14:54:22 +04:00
os-specific	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00
servers	vsftpd: update to 3.0.2	2012-12-29 12:22:50 +01:00
shells
stdenv
test
tools	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00
top-level	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00