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
dlopen-absolute-paths.diff	qt: update to version 4.8.3	2012-10-18 11:09:10 +02:00
dlopen-gtkstyle.diff	qt: update to version 4.8.3	2012-10-18 11:09:10 +02:00
dlopen-webkit-nsplugin.diff	Qt-4.8.0	2011-12-24 21:52:08 +00:00
glib-2.32.patch	qt4: Update to 4.8.3	2012-09-28 23:20:59 -04:00