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
..
e17	e17.embryo: Fix meta.	2013-02-16 16:38:46 -05:00
enlightenment
gnome-2	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
kde-4.7	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
kde-4.8	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
xfce	Major Xfce refactoring, also adding versions 4.10.*	2013-02-09 18:38:26 +01:00