Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/boost/generic.nix		2014-11-11 23:48:08 +01:00
..
applications	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
build-support
data
desktops	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
development	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
games	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
misc
os-specific	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
servers	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
shells
stdenv
test
tools	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
top-level	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00