Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ... Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix		2013-03-02 10:41:53 +01:00
..
default.nix	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
unstable.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00