summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorJim Galarowicz <jeg@krellinst.org>2015-11-06 11:55:49 -0800
committerJim Galarowicz <jeg@krellinst.org>2015-11-06 11:55:49 -0800
commit046b348bd374254037e3cfd97163d9c52caad075 (patch)
treece032717ea0fd0b0c0a27757e7ffa3db760b5939 /LICENSE
parentaa9b14aff47864c04f99bd4c83fb10dc6a9c49ad (diff)
parent9474b8cdac433ccae4451c810fb7f4bb1bd1bd16 (diff)
downloadspack-046b348bd374254037e3cfd97163d9c52caad075.tar.gz
spack-046b348bd374254037e3cfd97163d9c52caad075.tar.bz2
spack-046b348bd374254037e3cfd97163d9c52caad075.tar.xz
spack-046b348bd374254037e3cfd97163d9c52caad075.zip
Merge remote-tracking branch 'upstream/develop' into develop
Get up to date with rest of develop repository.
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions