]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97b561a e368cdd)
Auto merge of #36472 - GuillaumeGomez:rollup, r=GuillaumeGomez
authorbors <bors@rust-lang.org>
Wed, 14 Sep 2016 15:28:05 +0000 (08:28 -0700)
committerGitHub <noreply@github.com>
Wed, 14 Sep 2016 15:28:05 +0000 (08:28 -0700)
Rollup of 5 pull requests

- Successful merges: #36334, #36335, #36363, #36374, #36467
- Failed merges:

1  2 
src/librustdoc/html/render.rs patch | diff1 | diff2 | blob | history

diff --cc src/librustdoc/html/render.rs
Simple merge
Empowering everyone to build reliable and efficient software.