Skip to content

Conversation

apasel422
Copy link
Contributor

@rust-highfive
Copy link
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@aturon
Copy link
Contributor

aturon commented Apr 13, 2015

r? @steveklabnik

@rust-highfive rust-highfive assigned steveklabnik and unassigned aturon Apr 13, 2015
@steveklabnik
Copy link
Contributor

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 13, 2015

📌 Commit 143b9ed has been approved by steveklabnik

@steveklabnik
Copy link
Contributor

Thanks!

@bors
Copy link
Collaborator

bors commented Apr 13, 2015

☔ The latest upstream changes (presumably #24362) made this pull request unmergeable. Please resolve the merge conflicts.

@apasel422
Copy link
Contributor Author

Rebased.

@steveklabnik
Copy link
Contributor

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 13, 2015

📌 Commit 6fa16d6 has been approved by steveklabnik

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Apr 14, 2015
Conflicts:
	src/libstd/net/ip.rs
	src/libstd/sys/unix/fs.rs
	src/libstd/sys/unix/mod.rs
	src/libstd/sys/windows/mod.rs
@bors bors merged commit 6fa16d6 into rust-lang:master Apr 15, 2015
@apasel422 apasel422 deleted the docs branch April 15, 2015 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants