---

yaml
---
r: 226938
b: refs/heads/master
c: 0649b16
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 21eae93550216ca02c7fa949268d5d2907d36e26
+refs/heads/master: 0649b16ade40d1fb02ea5c390293278bd876854a
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/.gitattributes

@@ -6,6 +6,4 @@
 *.rs rust
 src/etc/pkg/rust-logo.ico binary
 src/etc/pkg/rust-logo.png binary
-src/rt/msvc/* -whitespace
-src/rt/valgrind/* -whitespace
 *.woff binary

trunk/.mailmap

@@ -10,11 +10,14 @@ Abhishek Chanda <[email protected]> Abhishek Chanda <abhishek@cloudscaling
 Ahmed Charles <[email protected]> <[email protected]>
 Aydin Kim <[email protected]> aydin.kim <[email protected]>
 Alex Lyon <[email protected]> <[email protected]>
+Alex Newman <[email protected]> Alex HotShot Newman <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Andreas Gal <[email protected]> <[email protected]>
+Andrew Kuchev <[email protected]> Andrew <[email protected]>
 Andrew Poelstra <[email protected]> <[email protected]>
 Anton Löfgren <[email protected]> <[email protected]>
-Ariel Ben-Yehuda <[email protected]> arielb1 <[email protected]> <[email protected]>
+Ariel Ben-Yehuda <[email protected]> arielb1 <[email protected]>
+Ariel Ben-Yehuda <[email protected]> Ariel Ben-Yehuda <[email protected]>
 Austin Seipp <[email protected]> <[email protected]>
 Ben Alpert <[email protected]> <[email protected]>
 Benjamin Jackman <[email protected]>
@@ -76,6 +79,7 @@ Kang Seonghoon <[email protected]> <[email protected]>
 Keegan McAllister <[email protected]> <[email protected]>
 Kyeongwoon Lee <[email protected]>
 Lee Wondong <[email protected]>
+Lee Jeffery <[email protected]> Lee Jeffery <[email protected]>
 Lennart Kudling <[email protected]>
 Lindsey Kuper <[email protected]> <[email protected]>
 Lindsey Kuper <[email protected]> <[email protected]>
@@ -121,8 +125,10 @@ startling <[email protected]>
 Steven Fackler <[email protected]> <[email protected]>
 Steven Stewart-Gallus <[email protected]> <[email protected]>
 Tamir Duberstein <[email protected]> Tamir Duberstein <[email protected]>
+Ticki <[email protected]> Ticki <@>
 Tim Chevalier <[email protected]> <[email protected]>
 Torsten Weber <[email protected]> <[email protected]>
+Ulrik Sverdrup <[email protected]> Ulrik Sverdrup <root@localhost>
 Vadim Petrochenkov <[email protected]> petrochenkov <[email protected]>
 William Ting <[email protected]> <[email protected]>
 Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]> XuefengWu <[email protected]>

trunk/.travis.yml

@@ -20,8 +20,7 @@ sudo: false
 before_script:
   - ./configure --enable-ccache
 script:
-  - make tidy
-  - make rustc-stage1 -j4
+  - make tidy check -j4
 
 env:
   - CXX=/usr/bin/g++-4.7