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
..
applications	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
build-support	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-17 14:19:14 +01:00
data	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-17 14:19:14 +01:00
desktops	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
development	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
games	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-01-20 16:53:21 +01:00
lib	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-17 14:19:14 +01:00
os-specific	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
servers	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
shells	bash: Disable parallel building	2013-01-23 16:32:57 +01:00
stdenv	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
test
tools	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
top-level	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00