Yury G. Kudryashov
|
b8fafa21e6
|
Merge commit 'trunk'
Conflicts:
pkgs/development/compilers/ocaml/default.nix
pkgs/development/interpreters/python/default.nix
pkgs/tools/package-management/nix/unstable.nix
pkgs/top-level/all-packages.nix
svn path=/nixpkgs/branches/stdenv-updates/; revision=9762
|
2007-11-19 22:43:29 +00:00 |
|