hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases

Browse source 
Conflicts:
	lib/spack/spack/__init__.py
	var/spack/repos/builtin/packages/gmp/package.py
	var/spack/repos/builtin/packages/openjpeg/package.py
This commit is contained in:
alalazo 2016-07-15 11:03:02 +02:00
parent 893a5565fe
commit 833b0ac282
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/__init__.py
View file

@ -184,7 +184,7 @@
'when',
'ver',
'alldeps',
'nolinks']
'nolink']
from spack.package import Package, ExtensionConflictError
from spack.package import CMakePackage, AutotoolsPackage, EditableMakefile
from spack.version import Version, ver