5b132f6e96
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863 |
||
---|---|---|
.. | ||
default.nix | ||
psimedia.nix |
5b132f6e96
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863 |
||
---|---|---|
.. | ||
default.nix | ||
psimedia.nix |