This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2 files changed
+4
-4
lines changedLines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
148 | 148 |
| |
149 | 149 |
| |
150 | 150 |
| |
151 |
| - | |
152 |
| - | |
| 151 | + | |
| 152 | + | |
153 | 153 |
| |
154 | 154 |
| |
155 | 155 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
23 |
| - | |
| 23 | + | |
24 | 24 |
| |
25 |
| - | |
| 25 | + |
5 commit comments
bors commentedon Mar 12, 2014
saw approval from alexcrichton
at alexcrichton@3f2434e
bors commentedon Mar 12, 2014
merging alexcrichton/rust/rollup = 3f2434e into auto
bors commentedon Mar 12, 2014
alexcrichton/rust/rollup = 3f2434e merged ok, testing candidate = 4d64441
bors commentedon Mar 12, 2014
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4697
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/2539
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/2538
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4694
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/3794
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3800
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/4709
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/3797
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3803
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/4711
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/3797
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/3802
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3870
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1688
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/4707
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/3809
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3815
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/4470
bors commentedon Mar 12, 2014
fast-forwarding master to auto = 4d64441