diff options
| author | Matthew LeGendre <legendre1@llnl.gov> | 2016-03-09 11:09:37 -0800 |
|---|---|---|
| committer | Matthew LeGendre <legendre1@llnl.gov> | 2016-03-09 11:09:37 -0800 |
| commit | 87db69478d021d16cc4770d804e7ccf94161d85b (patch) | |
| tree | 920ff0bb4ee32d4f7f502dd8b76edff86f3a9b99 /README.md | |
| parent | fa888a4ba15176e9d415ffced41f6f16801f1938 (diff) | |
| parent | ad7d89b16582bb9c89dfd5fd93bfa1b49c8935b0 (diff) | |
| download | spack-87db69478d021d16cc4770d804e7ccf94161d85b.tar.gz spack-87db69478d021d16cc4770d804e7ccf94161d85b.tar.bz2 spack-87db69478d021d16cc4770d804e7ccf94161d85b.tar.xz spack-87db69478d021d16cc4770d804e7ccf94161d85b.zip | |
Merge branch 'develop' into features/external-packages
Conflicts:
lib/spack/spack/package.py
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -19,7 +19,7 @@ written in pure Python, and specs allow package authors to write a single build script for many different builds of the same package. See the -[Feature Overview](http://llnl.github.io/spack/features.html) +[Feature Overview](http://software.llnl.gov/spack/features.html) for examples and highlights. To install spack and install your first package: @@ -31,7 +31,7 @@ To install spack and install your first package: Documentation ---------------- -[**Full documentation**](http://llnl.github.io/spack) for Spack is +[**Full documentation**](http://software.llnl.gov/spack) for Spack is the first place to look. See also: |