summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@googlemail.com>2015-10-22 15:53:44 +0200
committerMassimiliano Culpo <massimiliano.culpo@googlemail.com>2015-10-22 15:53:44 +0200
commitf475ec4ce644e2fdd018fc8585fe307b37808f26 (patch)
tree990fd61cb76f9b9b74a14293796deb4fb3c9e9ae /share
parent17de9a37f1d064e18ff61145196b1cb77ae8b64b (diff)
parent1f662465c26f6a6b3d055516c0dd6df9eb55fa64 (diff)
downloadspack-f475ec4ce644e2fdd018fc8585fe307b37808f26.tar.gz
spack-f475ec4ce644e2fdd018fc8585fe307b37808f26.tar.bz2
spack-f475ec4ce644e2fdd018fc8585fe307b37808f26.tar.xz
spack-f475ec4ce644e2fdd018fc8585fe307b37808f26.zip
Merge branch 'develop' of https://github.com/scalability-llnl/spack into issues/gcc
Conflicts: var/spack/packages/gcc/package.py GCC : removed dependency on libelf. Removed isl variant
Diffstat (limited to 'share')
-rwxr-xr-xshare/spack/logo/favicon.icobin0 -> 1150 bytes
-rw-r--r--share/spack/logo/spack-logo-text-64.pngbin0 -> 18644 bytes
-rw-r--r--share/spack/logo/spack-logo-white-text-48.pngbin0 -> 12201 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/share/spack/logo/favicon.ico b/share/spack/logo/favicon.ico
new file mode 100755
index 0000000000..95a67ae5b1
--- /dev/null
+++ b/share/spack/logo/favicon.ico
Binary files differ
diff --git a/share/spack/logo/spack-logo-text-64.png b/share/spack/logo/spack-logo-text-64.png
new file mode 100644
index 0000000000..8dad4c519f
--- /dev/null
+++ b/share/spack/logo/spack-logo-text-64.png
Binary files differ
diff --git a/share/spack/logo/spack-logo-white-text-48.png b/share/spack/logo/spack-logo-white-text-48.png
new file mode 100644
index 0000000000..9e60867e81
--- /dev/null
+++ b/share/spack/logo/spack-logo-white-text-48.png
Binary files differ