Skip to content
Commit 48d2b929 authored by Shea Levy's avatar Shea Levy
Browse files

Merge branch 'pew' of git://github.com/berdario/nixpkgs 

Added Pew (and misc. related changes)

Conflicts:
	pkgs/top-level/python-packages.nix
parents 6d1ca3bc e62bf911
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