commit 00db6f6e7be04882b67660adcf04811511d4b8c2
author bors <bors@rust-lang.org> Wed Sep 25 17:55:53 2013 -0700
committer bors <bors@rust-lang.org> Wed Sep 25 17:55:53 2013 -0700
tree 8568d9020b5631f85b0dd20101fd291bbd66798c
parent 41826c48eddfb964b830229dff6f0480ac649827
parent e82db13760096bd2193c55b8b4965d5519fe71fa

auto merge of #9502 : brson/rust/fix-logo-icon, r=brson

.gitattributes

diff --git a/.gitattributes b/.gitattributes
index 39221d3..57f8083 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,6 +4,7 @@
 *.cpp rust
 *.h rust
 *.rs rust
+src/etc/pkg/rust-logo.ico binary
 src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
 src/rt/linenoise/* -whitespace

src/etc/pkg/rust-logo.ico

diff --git a/src/etc/pkg/rust-logo.ico b/src/etc/pkg/rust-logo.ico
index 4de8f87..4749b39 100644
--- a/src/etc/pkg/rust-logo.ico
+++ b/src/etc/pkg/rust-logo.ico
Binary files differ