Merge remote branch 'origin/master' into dflt-heur

rust-lang · Jun 5, 2016 · 5fd5bec · 5fd5bec
2 parents 1f0a37f + 51d0e38
commit 5fd5bec
Show file tree

Hide file tree

Showing 3 changed files with 343 additions and 340 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,4 @@
-* text=auto eol=lf
+*.rs text eol=lf
+*.lock text eol=lf
+*.txt text eol=lf
+*.toml text eol=lf