Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/misc/emulators/wine/default.nix		2013-06-10 10:04:46 +04:00
..
applications	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
build-support
data	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
desktops	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
development	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
games
lib	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
misc	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
os-specific	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
servers	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
shells	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
stdenv
test
tools	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
top-level	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00