summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-03-22 15:57:35 +0100
committeralalazo <massimiliano.culpo@googlemail.com>2016-03-22 15:57:35 +0100
commit6e847b7d76acf2fb6cda3ef251c311c011008d40 (patch)
tree60beafd21cc2f45a6acfbaa2de7301b3d98729a1 /README.md
parent4b22c2406c163c83998de8938b5fefa18886057e (diff)
parente32eb7e990119288e0bbffe1786b5cd20547e0ad (diff)
downloadspack-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.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index bdce345764..8664953c0c 100644
--- a/README.md
+++ b/README.md
@@ -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: