Merge pull request #6 from rust-lang/master

rebase code from rust-lang/rust master branch
nielx · Aug 20, 2019 · 0c8a14c · 0c8a14c
2 parents 7ab6fa0 + bea0372
commit 0c8a14c
Show file tree

Hide file tree

Showing 790 changed files with 12,575 additions and 7,702 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,7 +8,7 @@
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge linguist-generated=false
+Cargo.lock linguist-generated=false
 
 # Older git versions try to fix line endings on images, this prevents it.
 *.png binary