Skip to content

Commit

Permalink
rustdoc: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
adrientetar committed Feb 5, 2014
1 parent 0ebe112 commit 611c7a6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/librustdoc/html/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ pub fn run(mut crate: clean::Crate, dst: Path) -> io::IoResult<()> {
let mut dst = cx.dst.join(crate.name.as_slice());
if_ok!(mkdir(&dst));
if_ok!(write(dst.join("jquery.js"),
include_str!("static/jquery-2.0.3.min.js")));
include_str!("static/jquery-2.1.0.min.js")));
if_ok!(write(dst.join("main.js"), include_str!("static/main.js")));
if_ok!(write(dst.join("main.css"), include_str!("static/main.css")));
if_ok!(write(dst.join("normalize.css"),
Expand Down
6 changes: 0 additions & 6 deletions src/librustdoc/html/static/jquery-2.0.3.min.js

This file was deleted.

4 changes: 4 additions & 0 deletions src/librustdoc/html/static/jquery-2.1.0.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/librustdoc/html/static/normalize.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 comments on commit 611c7a6

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at adrientetar@611c7a6

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging adridu59/rust/tidy = 611c7a6 into auto

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adridu59/rust/tidy = 611c7a6 merged ok, testing candidate = f715aa46

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at adrientetar@611c7a6

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging adridu59/rust/tidy = 611c7a6 into auto

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adridu59/rust/tidy = 611c7a6 merged ok, testing candidate = 96e0bede

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at adrientetar@611c7a6

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging adridu59/rust/tidy = 611c7a6 into auto

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adridu59/rust/tidy = 611c7a6 merged ok, testing candidate = 9a672f9

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 611c7a6 Feb 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 9a672f9

Please sign in to comment.