diff options
author | Matthew LeGendre <legendre1@llnl.gov> | 2016-01-25 10:52:17 -0800 |
---|---|---|
committer | Matthew LeGendre <legendre1@llnl.gov> | 2016-01-25 10:52:17 -0800 |
commit | fa888a4ba15176e9d415ffced41f6f16801f1938 (patch) | |
tree | f39f431b0bd37f385353c62d0f6ce1a981abff3f /bin/spack-python | |
parent | fac4428766fb0a6b6cd357b654215f55df1220d4 (diff) | |
parent | 04a8439c39e674abb89d7a3f8dea82810c7ca682 (diff) | |
download | spack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.gz spack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.bz2 spack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.xz spack-fa888a4ba15176e9d415ffced41f6f16801f1938.zip |
Merge branch 'develop' into features/external-packages
Conflicts:
lib/spack/spack/cmd/mirror.py
lib/spack/spack/concretize.py
lib/spack/spack/config.py
lib/spack/spack/spec.py
lib/spack/spack/stage.py
var/spack/packages/mvapich2/package.py
Diffstat (limited to 'bin/spack-python')
-rwxr-xr-x | bin/spack-python | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/spack-python b/bin/spack-python index 8a4b9c175d..e0745e8c58 100755 --- a/bin/spack-python +++ b/bin/spack-python @@ -7,7 +7,7 @@ # Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. # LLNL-CODE-647188 # -# For details, see https://scalability-llnl.github.io/spack +# For details, see https://github.com/llnl/spack # Please also see the LICENSE file for our notice and the LGPL. # # This program is free software; you can redistribute it and/or modify |