diff options
| author | Jim Galarowicz <jeg@krellinst.org> | 2015-11-06 11:55:49 -0800 |
|---|---|---|
| committer | Jim Galarowicz <jeg@krellinst.org> | 2015-11-06 11:55:49 -0800 |
| commit | 046b348bd374254037e3cfd97163d9c52caad075 (patch) | |
| tree | ce032717ea0fd0b0c0a27757e7ffa3db760b5939 /share | |
| parent | aa9b14aff47864c04f99bd4c83fb10dc6a9c49ad (diff) | |
| parent | 9474b8cdac433ccae4451c810fb7f4bb1bd1bd16 (diff) | |
| download | spack-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 'share')
| -rwxr-xr-x | share/spack/logo/favicon.ico | bin | 0 -> 1150 bytes |
| -rw-r--r-- | share/spack/logo/spack-logo-text-64.png | bin | 0 -> 18644 bytes |
| -rw-r--r-- | share/spack/logo/spack-logo-white-text-48.png | bin | 0 -> 12201 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/share/spack/logo/favicon.ico b/share/spack/logo/favicon.ico Binary files differnew file mode 100755 index 0000000000..95a67ae5b1 --- /dev/null +++ b/share/spack/logo/favicon.ico diff --git a/share/spack/logo/spack-logo-text-64.png b/share/spack/logo/spack-logo-text-64.png Binary files differnew file mode 100644 index 0000000000..8dad4c519f --- /dev/null +++ b/share/spack/logo/spack-logo-text-64.png diff --git a/share/spack/logo/spack-logo-white-text-48.png b/share/spack/logo/spack-logo-white-text-48.png Binary files differnew file mode 100644 index 0000000000..9e60867e81 --- /dev/null +++ b/share/spack/logo/spack-logo-white-text-48.png |
