Skip to content
Snippets Groups Projects
Commit 0c94a6e2 authored by Todd Gamblin's avatar Todd Gamblin
Browse files

Merge branch 'features/python-modules' into features/memaxes

Conflicts:
	var/spack/packages/qt/package.py
parents d1d0b85d 5c2608b0
No related branches found
No related tags found
No related merge requests found
Showing
with 143 additions and 38 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment