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
..
default.nix	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
docbook.patch	Kdesvn fixed. At the end it was a wrong docbook type only in one of the docbook	2010-11-02 13:35:28 +00:00
virtual_inheritance.patch	Let hydra build kdesvn and krusader.	2012-02-22 14:51:15 +00:00