diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-08-11 08:55:20 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-08-11 08:55:20 +0200 |
| commit | b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641 (patch) | |
| tree | c6a4c9d60798a9502a6d1e2a6d0641a2041053ee /.mailmap | |
| parent | b92deda41bf2995a8a7b717ea8149af7797e30d5 (diff) | |
| parent | f59653ac2c9b20ec5954d90fda019c7652644ac9 (diff) | |
| download | spack-b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641.tar.gz spack-b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641.tar.bz2 spack-b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641.tar.xz spack-b4b9ebe7d718d169dd5f2ab41d4cbc00fed88641.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases
Conflicts:
lib/spack/llnl/util/tty/log.py
lib/spack/spack/__init__.py
lib/spack/spack/cmd/install.py
lib/spack/spack/cmd/setup.py
lib/spack/spack/package.py
var/spack/repos/builtin/packages/blitz/package.py
var/spack/repos/builtin/packages/gmp/package.py
var/spack/repos/builtin/packages/qhull/package.py
var/spack/repos/builtin/packages/szip/package.py
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions