summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorKevin Brandstatter <kjbrandstatter@gmail.com>2015-02-26 14:42:12 -0600
committerKevin Brandstatter <kjbrandstatter@gmail.com>2015-02-26 14:42:12 -0600
commit2f2eab0e157b7ebced80772d9bc81b205d69d620 (patch)
tree2e7fc63859631b84f68aeeb14d8414a5ecb01f9c /README.md
parentbbfc519ee5631efa4224d852d9c63446a60a8c07 (diff)
parentffdb90f39a56e5f0dacefd19ccf85ddd0e7a01c0 (diff)
downloadspack-2f2eab0e157b7ebced80772d9bc81b205d69d620.tar.gz
spack-2f2eab0e157b7ebced80772d9bc81b205d69d620.tar.bz2
spack-2f2eab0e157b7ebced80772d9bc81b205d69d620.tar.xz
spack-2f2eab0e157b7ebced80772d9bc81b205d69d620.zip
Merge branch 'develop' of github.com:kev40293/spack into develop
Diffstat (limited to 'README.md')
-rw-r--r--README.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/README.md b/README.md
index 7a13dba2a8..69632b8933 100644
--- a/README.md
+++ b/README.md
@@ -36,16 +36,19 @@ Authors
----------------
Spack was written by Todd Gamblin, tgamblin@llnl.gov.
-Significant contributions were also made by the following awesome
-people:
+Significant contributions were also made by:
* David Beckingsale
* David Boehme
+ * Alfredo Gimenez
* Luc Jaulmes
* Matt Legendre
* Greg Lee
* Adam Moody
+ * Saravan Pantham
+ * Joachim Protze
* Bob Robey
+ * Justin Too
Release
----------------