Skip to content

Commit 0c8a14c

Browse files
authored
Merge pull request #6 from rust-lang/master
rebase code from rust-lang/rust master branch
2 parents 7ab6fa0 + bea0372 commit 0c8a14c

File tree

790 files changed

+12575
-7702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

790 files changed

+12575
-7702
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
src/etc/installer/gfx/* binary
99
*.woff binary
1010
src/vendor/** -text
11-
Cargo.lock -merge linguist-generated=false
11+
Cargo.lock linguist-generated=false
1212

1313
# Older git versions try to fix line endings on images, this prevents it.
1414
*.png binary

0 commit comments

Comments
 (0)