rebase code from rust-lang/rust master branch #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

BaoshanPang merged 404 commits into Wind-River:master from rust-lang:master

Aug 20, 2019

Merged

rebase code from rust-lang/rust master branch #6

Filter by extension

.gitattributes

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@