summaryrefslogtreecommitdiff
path: root/website/logo.png
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-01 23:08:58 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-01 23:08:58 -0700
commit948b21702fbeaf1874286bd9b0d7c27c37d55c2a (patch)
tree87be9f29516bfe0ca78ad61a57c666e76adfcd28 /website/logo.png
parent5bb8d410b08bf36d1ff3f36257ac364080d80aa9 (diff)
parent212c4e507b0a96a05fa8ee4232e821c77285eebf (diff)
Merge commit 'dkg/master'
Conflicts: website/doc.mdwn website/templates/nav.mdwn
Diffstat (limited to 'website/logo.png')
-rw-r--r--website/logo.pngbin0 -> 11425 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/website/logo.png b/website/logo.png
new file mode 100644
index 0000000..33b3e78
--- /dev/null
+++ b/website/logo.png
Binary files differ