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
..
arduino
compilers	gcc: Don't symlink lib and lib64 when building multilib	2013-02-16 18:54:47 -05:00
eclipse
guile-modules
interpreters	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
libraries	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
misc
mobile	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
ocaml-modules
perl-modules
python-modules
qtcreator
ruby-modules
tools	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
web	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00