diff options
| author | bors <bors@rust-lang.org> | 2013-09-25 17:55:53 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-25 17:55:53 -0700 |
| commit | 00db6f6e7be04882b67660adcf04811511d4b8c2 (patch) | |
| tree | 8568d9020b5631f85b0dd20101fd291bbd66798c | |
| parent | 41826c48eddfb964b830229dff6f0480ac649827 (diff) | |
| parent | e82db13760096bd2193c55b8b4965d5519fe71fa (diff) | |
| download | rust-00db6f6e7be04882b67660adcf04811511d4b8c2.tar.gz rust-00db6f6e7be04882b67660adcf04811511d4b8c2.zip | |
auto merge of #9502 : brson/rust/fix-logo-icon, r=brson
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | src/etc/pkg/rust-logo.ico | bin | 94337 -> 94339 bytes |
2 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 39221d3928e..57f8083a556 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 diff --git a/src/etc/pkg/rust-logo.ico b/src/etc/pkg/rust-logo.ico index 4de8f87ae26..4749b398c2d 100644 --- a/src/etc/pkg/rust-logo.ico +++ b/src/etc/pkg/rust-logo.ico Binary files differ |