diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-06-16 03:03:26 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-06-16 03:03:26 -0700 |
| commit | 88b73bacdbb8a3254c6e52b6b332e49b00095c37 (patch) | |
| tree | b1785a3634d0d23e07774984f9cbf1f0d06ed934 /.travis.yml | |
| parent | c803f7ae98dd7a1762e4eda89145e6ca50091136 (diff) | |
| parent | 17b868381f95fa324f7c6327c0977b303975de76 (diff) | |
| download | spack-88b73bacdbb8a3254c6e52b6b332e49b00095c37.tar.gz spack-88b73bacdbb8a3254c6e52b6b332e49b00095c37.tar.bz2 spack-88b73bacdbb8a3254c6e52b6b332e49b00095c37.tar.xz spack-88b73bacdbb8a3254c6e52b6b332e49b00095c37.zip | |
Merge branch 'features/newarch' into develop
Conflicts:
lib/spack/spack/config.py
var/spack/repos/builtin/packages/lua/package.py
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions