5417c720fd
I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878 |
||
---|---|---|
.. | ||
enlightenment | ||
gnome-2.28 | ||
kde-3 | ||
kde-4.4 | ||
kde-4.5/support | ||
xfce-4 |