Lluís Batlle i Rossell 3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates ... Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix		2013-01-27 11:32:12 +01:00
..
generic	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
linux	Pass ‘config’ to stdenv/generic/default.nix	2013-01-17 23:24:55 +01:00
mingw
native	Pass ‘config’ to stdenv/generic/default.nix	2013-01-17 23:24:55 +01:00
nix	Pass ‘config’ to stdenv/generic/default.nix	2013-01-17 23:24:55 +01:00
adapters.nix	More renames	2012-12-28 19:42:10 +01:00
common-path.nix
default.nix	Pass ‘config’ to stdenv/generic/default.nix	2013-01-17 23:24:55 +01:00