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
..
builder.sh	Revert "Merge pull request #229 from viric/niximpure2-stdenv-updates"	2012-12-28 15:46:45 +01:00
default-builder.sh
default.nix	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
setup.sh	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00