Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates ... mountall conflict was trivial Conflicts: pkgs/os-specific/linux/mountall/default.nix		2012-07-14 14:24:27 -04:00
..
applications	Build the LinuxSampler LV2 plugin	2012-07-14 18:50:32 +02:00
build-support	Merge remote-tracking branch 'upstream/master' into x-updates	2012-07-14 14:24:27 -04:00
data	Merge remote-tracking branch 'upstream/master' into x-updates	2012-07-14 14:24:27 -04:00
desktops
development	Merge remote-tracking branch 'upstream/master' into x-updates	2012-07-14 14:24:27 -04:00
games	kobodeluxe: fix compilation errors.	2012-07-12 23:42:20 +02:00
lib	Fix the "path" option type	2012-07-12 11:54:05 -04:00
misc
os-specific	Merge remote-tracking branch 'upstream/master' into x-updates	2012-07-14 14:24:27 -04:00
servers	Merge remote-tracking branch 'upstream/master' into x-updates	2012-07-14 14:24:27 -04:00
shells
stdenv
test
tools	Merge remote-tracking branch 'upstream/master' into x-updates	2012-07-14 14:24:27 -04:00
top-level	Merge remote-tracking branch 'upstream/master' into x-updates	2012-07-14 14:24:27 -04:00