Skip to content
Snippets Groups Projects
Verified Commit ea9b2eef authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'master' of https://gitlab.redox-os.org/redox-os/cookbook

parents 3d3b2f02 0c396761
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.cargo/config
+ 2
− 1
View file @ ea9b2eef
paths = [ paths = [
"patches/atty", "patches/atty",
"patches/liblibc", "patches/libc",
"patches/mio", "patches/mio",
"patches/nix",
"patches/tokio/tokio", "patches/tokio/tokio",
"patches/tokio/tokio-reactor", "patches/tokio/tokio-reactor",
"patches/net2-rs", "patches/net2-rs",
......
.gitmodules
+ 8
− 0
View file @ ea9b2eef
...@@ -48,3 +48,11 @@ ...@@ -48,3 +48,11 @@
[submodule "patches/tokio"] [submodule "patches/tokio"]
path = patches/tokio path = patches/tokio
url = https://gitlab.redox-os.org/redox-os/tokio.git url = https://gitlab.redox-os.org/redox-os/tokio.git
[submodule "patches/libc"]
path = patches/libc
url = https://github.com/AdminXVII/libc
branch = extra-traits-redox
[submodule "patches/nix"]
path = patches/nix
url = https://github.com/AdminXVII/nix
branch = add-redox-support
libc @ f6c0ead0
Subproject commit f6c0ead0279077dd9bda305e6c9d3ba3267390b2
liblibc @ eb75c489
Compare eb75c489...eb75c489
Subproject commit eb75c489172e10bfcb57ca679ff337827cf783a9
nix @ 6fd64569
Subproject commit 6fd64569452536e9759c45c8f4511e6c983196f3
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment