diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-17 20:39:58 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-17 20:39:58 +0000 |
| commit | b48b2a7bb4add41c33f680df0117e3c92cc0515b (patch) | |
| tree | 2f7451135e2dd9619e142529c4672d0317b12312 /pkgs/development/interpreters/spidermonkey/default.nix | |
| parent | e60ba9135a90808a3443d09fbd92f2259e9deea8 (diff) | |
| parent | a6f1f87697768e39c5ed7f1e475b3002e1418d46 (diff) | |
| download | nixlib-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar nixlib-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.gz nixlib-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.bz2 nixlib-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.lz nixlib-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.xz nixlib-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.zst nixlib-b48b2a7bb4add41c33f680df0117e3c92cc0515b.zip | |
Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
Diffstat (limited to 'pkgs/development/interpreters/spidermonkey/default.nix')
0 files changed, 0 insertions, 0 deletions