Vladimír Čunát e740b565cf Merge master into stdenv-updates ... Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix		2013-12-29 10:01:22 +01:00
..
bsdiff
bzip2
gzip
gzrt
lrzip	Updating lrzip to 0.616	2013-10-20 21:10:02 +04:00
lzip
lzop
ncompress
pbzip2
pigz
rzip
upx	upx: update from 3.07 to 3.09	2013-12-21 02:28:28 +02:00
xdelta
xz
zdelta
zsync