Vladimír Čunát 625f40151b Merge branch 'master' into x-updates ... Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix		2013-08-02 18:30:53 +02:00
..
default.nix	Merge branch 'master' into x-updates	2013-08-02 18:30:53 +02:00
dlopen-absolute-paths.diff	qt4: maintenance update 4.8.4 -> 4.8.5	2013-07-04 15:29:23 +02:00
dlopen-gtkstyle.diff	qt: update to version 4.8.3	2012-10-18 11:09:10 +02:00
dlopen-webkit-nsplugin.diff
glib-2.32.patch	qt4: Update to 4.8.3	2012-09-28 23:20:59 -04:00