summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authoralalazo <massimiliano.culpo@googlemail.com>2016-03-22 15:57:35 +0100
committeralalazo <massimiliano.culpo@googlemail.com>2016-03-22 15:57:35 +0100
commit6e847b7d76acf2fb6cda3ef251c311c011008d40 (patch)
tree60beafd21cc2f45a6acfbaa2de7301b3d98729a1 /LICENSE
parent4b22c2406c163c83998de8938b5fefa18886057e (diff)
parente32eb7e990119288e0bbffe1786b5cd20547e0ad (diff)
downloadspack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.gz
spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.bz2
spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.tar.xz
spack-6e847b7d76acf2fb6cda3ef251c311c011008d40.zip
Merge branch 'develop' of https://github.com/LLNL/spack into qa/coding_standard
Conflicts: .travis.yml
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions