diff options
author | alalazo <massimiliano.culpo@googlemail.com> | 2016-03-22 15:57:35 +0100 |
---|---|---|
committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-03-22 15:57:35 +0100 |
commit | 6e847b7d76acf2fb6cda3ef251c311c011008d40 (patch) | |
tree | 60beafd21cc2f45a6acfbaa2de7301b3d98729a1 /README.md | |
parent | 4b22c2406c163c83998de8938b5fefa18886057e (diff) | |
parent | e32eb7e990119288e0bbffe1786b5cd20547e0ad (diff) | |
download | spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.gz spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.bz2 spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.xz spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.zip |
Merge branch 'develop' of https://github.com/LLNL/spack into qa/coding_standard
Conflicts:
.travis.yml
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: |