Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv ... Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix		2014-09-08 18:24:58 +02:00
..
default.nix	gstreamer-1: bugfix-only update of all components	2014-08-30 11:24:25 +02:00
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00