Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
darwin
generic	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
linux	Fix stdenv allowedRequisites check	2014-11-06 15:33:36 +01:00
native
nix
adapters.nix	useGoldLinker: Don't set dontStrip	2014-11-12 15:10:54 +01:00
common-path.nix
default.nix