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
..
documentation	Merge branch 'master' into stdenv-updates.	2013-01-04 21:00:53 +01:00
fonts	Get rid of the "sf" alias for "sourceforge"	2013-01-14 12:00:32 +01:00
misc	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
sgml+xml