summary refs log tree commit diff
path: root/pkgs/stdenv/default.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-26 21:34:53 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-26 21:34:53 +0000
commitadc61253b991e2df564e48e4278fab3aefa0a09d (patch)
tree17e4e025c5dbc654a7e564a4bec861a8b0c0f0fe /pkgs/stdenv/default.nix
parent8a115c13ad63cb36042b5456ad83aae34b017436 (diff)
parente0491358eb7a8e5b9c01c080a921d99f4b2a04c4 (diff)
downloadnixlib-adc61253b991e2df564e48e4278fab3aefa0a09d.tar
nixlib-adc61253b991e2df564e48e4278fab3aefa0a09d.tar.gz
nixlib-adc61253b991e2df564e48e4278fab3aefa0a09d.tar.bz2
nixlib-adc61253b991e2df564e48e4278fab3aefa0a09d.tar.lz
nixlib-adc61253b991e2df564e48e4278fab3aefa0a09d.tar.xz
nixlib-adc61253b991e2df564e48e4278fab3aefa0a09d.tar.zst
nixlib-adc61253b991e2df564e48e4278fab3aefa0a09d.zip
Merging from trunk, partially, to get rid of the annoying failing commits from
svn when files were removed, recreated and whatever...
 svn merge -r 18479:18485 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18659
Diffstat (limited to 'pkgs/stdenv/default.nix')
0 files changed, 0 insertions, 0 deletions