summary refs log tree commit diff
path: root/pkgs/development/libraries/libjpeg
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-08-31 13:05:41 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-08-31 13:09:15 +0200
commit29901451700a7382f3f9d5a0a23cd55b187e5585 (patch)
tree599bf9b4d98d71c07610deeb29baf5ceccfb40e5 /pkgs/development/libraries/libjpeg
parent8da52a642a293c5b62d044d61e8dd5f5c05eaeb6 (diff)
parent2c09066dfd1e9f332603993829e128a0261e9840 (diff)
downloadnixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar
nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.gz
nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.bz2
nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.lz
nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.xz
nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.tar.zst
nixpkgs-29901451700a7382f3f9d5a0a23cd55b187e5585.zip
remerge to retrieve refactoring lost 10 days ago
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/development/libraries/libjpeg')
0 files changed, 0 insertions, 0 deletions