---

bors · bors · commit dc2b7c6c5b14 · 2013-09-17T01:00:47.000-07:00
yaml --- r: 80543 b: refs/heads/master c: 6055611 h: refs/heads/master i: 80541: abb031f 80539: 7291d1b 80535: c91487b 80527: 0967aeb 80511: acde26f v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d1c05504ba0ec65aac73ebaac82cbac7602d0f87
+refs/heads/master: 6055611af615afea03374f7a08f2849c93dca839
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
 refs/heads/try: 71bebebc37fbb229877da88dde13c2f35913bd77
diff --git a/trunk/.gitattributes b/trunk/.gitattributes
@@ -1,13 +1,10 @@
 [attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
 
-* text=auto
+* text eol=lf
 *.cpp rust
 *.h rust
 *.rs rust
 src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
 src/rt/linenoise/* -whitespace
 src/rt/jemalloc/**/* -whitespace
-src/rt/jemalloc/include/jemalloc/jemalloc.h.in text eol=lf
-src/rt/jemalloc/include/jemalloc/jemalloc_defs.h.in text eol=lf
-src/rt/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in text eol=lf
