nixpkgs/pkgs
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
..
applications Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
build-support Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
data Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
desktops kde48.okteta: disable parallel build 2013-02-28 09:54:22 +01:00
development Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
games freedink: update and fix 2013-02-28 16:34:19 +01:00
lib Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
misc Merge branch 'master' into stdenv-updates. 2013-02-25 01:26:26 +01:00
os-specific Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
servers Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
shells Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
stdenv stdenv/setup.sh: Always run postPatch hook. 2013-02-27 15:26:18 +01:00
test
tools Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
top-level Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00