Skip to content
Commit 5b132f6e authored by Yury G. Kudryashov's avatar Yury G. Kudryashov
Browse files

svn merge ^/nixpkgs/trunk 

Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
parents f878980c d9de74ed
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment