6f2fac6466
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251 |
||
---|---|---|
.. | ||
cabextract | ||
cpio | ||
cromfs | ||
dar | ||
gnutar | ||
p7zip | ||
sharutils | ||
unrar | ||
unshield | ||
unzip | ||
zip |
6f2fac6466
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251 |
||
---|---|---|
.. | ||
cabextract | ||
cpio | ||
cromfs | ||
dar | ||
gnutar | ||
p7zip | ||
sharutils | ||
unrar | ||
unshield | ||
unzip | ||
zip |