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
desktops
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
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
stdenv
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