6f2fac6466
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251 |
||
---|---|---|
.. | ||
bsdiff | ||
bzip2 | ||
gzip | ||
lrzip | ||
lzop | ||
ncompress | ||
pbzip2 | ||
pigz | ||
rzip | ||
upx | ||
xz | ||
zdelta |
6f2fac6466
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251 |
||
---|---|---|
.. | ||
bsdiff | ||
bzip2 | ||
gzip | ||
lrzip | ||
lzop | ||
ncompress | ||
pbzip2 | ||
pigz | ||
rzip | ||
upx | ||
xz | ||
zdelta |