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
..
builder.sh	stdenv: Statically include the default build inputs	2014-11-06 12:10:28 +01:00
default-builder.sh
default.nix	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
setup.sh	stdenv: Statically include the default build inputs	2014-11-06 12:10:28 +01:00