Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging' ... Conflicts: pkgs/applications/version-management/subversion/default.nix		2014-09-08 11:42:09 +02:00
..
darwin	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
gnu	gnu: Fix (evaluation of the) call to forceSystem.	2014-07-28 20:46:32 +02:00
linux	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00