summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMario Melara <maamelara@gmail.com>2015-11-04 13:06:56 -0800
committerMario Melara <maamelara@gmail.com>2015-11-04 13:06:56 -0800
commite3a02ea5c70a91731c042ee6b7c00e8c3395a254 (patch)
treedc5e24828d05c2b566f4d70e64c388cff7795740 /var
parent37260962e545366d0d882b205be807562c36f3b7 (diff)
parent35532d6b0aaa428e1d8234513e9e887d08c3914c (diff)
downloadspack-e3a02ea5c70a91731c042ee6b7c00e8c3395a254.tar.gz
spack-e3a02ea5c70a91731c042ee6b7c00e8c3395a254.tar.bz2
spack-e3a02ea5c70a91731c042ee6b7c00e8c3395a254.tar.xz
spack-e3a02ea5c70a91731c042ee6b7c00e8c3395a254.zip
Merge branch 'features/spackathon' of https://github.com/NERSC/spack into features/spackathon
Conflicts: lib/spack/spack/architecture.py
Diffstat (limited to 'var')
0 files changed, 0 insertions, 0 deletions