summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2016-03-17 21:52:24 -0400
committerErik Schnetter <schnetter@gmail.com>2016-03-17 21:52:24 -0400
commit84b7cd593fe64c22b5852bf98d2389509692e966 (patch)
treeae14656731730cad2cc55a5eb4e10c4cb94b1864 /README.md
parentff81aff2540f9eadd8d0ce123ae3143ebcb68789 (diff)
parent63f9f4291aedf0871c75e5aed31a5625fe9c4613 (diff)
downloadspack-84b7cd593fe64c22b5852bf98d2389509692e966.tar.gz
spack-84b7cd593fe64c22b5852bf98d2389509692e966.tar.bz2
spack-84b7cd593fe64c22b5852bf98d2389509692e966.tar.xz
spack-84b7cd593fe64c22b5852bf98d2389509692e966.zip
Merge branch 'develop' into correct-cc
# Conflicts: # lib/spack/env/cc
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: