diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-25 16:35:55 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-25 16:35:55 -0800 |
| commit | c65fd3a28968f549eed361d85f715caa4f8f6436 (patch) | |
| tree | d058a307946c8bf5445f4d0cb8ac31a8819329c4 /.mailmap | |
| parent | 34401cf0c3ee019fd6b8fb739e2a511c6de0870c (diff) | |
| parent | 28d61f0d7f1569e643fd79fa9c31c21c2e6ec4e4 (diff) | |
| download | spack-c65fd3a28968f549eed361d85f715caa4f8f6436.tar.gz spack-c65fd3a28968f549eed361d85f715caa4f8f6436.tar.bz2 spack-c65fd3a28968f549eed361d85f715caa4f8f6436.tar.xz spack-c65fd3a28968f549eed361d85f715caa4f8f6436.zip | |
Merge branch 'develop' into mplegendre-multi_pkgsrc_roots
Conflicts:
lib/spack/spack/cmd/create.py
lib/spack/spack/cmd/extensions.py
lib/spack/spack/cmd/fetch.py
lib/spack/spack/cmd/uninstall.py
lib/spack/spack/config.py
lib/spack/spack/database.py
lib/spack/spack/directory_layout.py
lib/spack/spack/packages.py
lib/spack/spack/spec.py
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions