]> git.lizzy.rs Git - rust.git/commit
rollup merge of #20725: tomjakubowski/rustdoc-misc
authorAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:19:51 +0000 (17:19 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:19:51 +0000 (17:19 -0800)
commitcb344be99d6b491017558ffbd015b9a0b86e8558
treec8e4f9c13897e3afe768f8ccfae402793ed275bc
parenta204dc56c97f35632575b1baa008f2e069b1bed9
parenta0734ff7e03b57db46cf8549c8329cddce4934ec
rollup merge of #20725: tomjakubowski/rustdoc-misc

Conflicts:
src/librustdoc/html/format.rs
src/librustdoc/html/format.rs