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 |
||
---|---|---|
.. | ||
akonadi | ||
attica | ||
automoc4 | ||
eigen | ||
phonon | ||
polkit-qt | ||
qca2 | ||
qimageblitz | ||
soprano | ||
strigi |