Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates ... x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)		2013-02-21 12:43:00 +01:00
..
applications	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
build-support	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
data	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
desktops	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
development	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
games	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-02-17 08:19:40 -05:00
lib	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
misc	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
os-specific	Merge branch 'upstream-master' into stdenv-updates	2013-02-19 10:09:39 -05:00
servers	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
shells	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
stdenv	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
test
tools	Merge branch 'upstream-master' into stdenv-updates	2013-02-19 10:09:39 -05:00
top-level	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00