9183f21f7e
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438 |
||
---|---|---|
.. | ||
gnunet | ||
ldcpp | ||
mldonkey | ||
valknut |