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

Merge branch 'master' of github.com:redox-os/redox

parents 5d462243 9d0ec3ea
No related branches found
No related tags found
No related merge requests found
......@@ -43,7 +43,7 @@ A bit more formal way of communication with fellow Redox devs, but a little less
### <a name="prs"> Pull Requests </a>
It's fine to just submit a small pull request without first making an issue or asking in the chat, but if it's a significant change that will require a lot of **planning and reviewing**. Also see [Creating a Pull Request](#creating-a-pr) and [Git Style Guidelines](#git-style-guidelines).
It's fine to just submit a small pull request without first making an issue or asking in the chat, **unless** it's a significant change that will require a lot of planning and reviewing. Also see [Creating a Pull Request](#creating-a-pr) and [Git Style Guidelines](#git-style-guidelines).
### <a name="discourse"> Discourse </a>
......
......@@ -105,7 +105,7 @@ $ cd path/to/your/projects/folder/
# Run bootstrap setup
$ curl -sf https://raw.githubusercontent.com/redox-os/redox/master/bootstrap.sh -o bootstrap.sh && bash -e bootstrap.sh
#Change to project directory
# Change to project directory
$ cd redox
# Build Redox
......@@ -139,6 +139,7 @@ $ ./bootstrap.sh -d
# Install rustup.rs
$ curl https://sh.rustup.rs -sSf | sh
$ source $HOME/.cargo/env
# Install the sysroot manager Xargo
$ cargo install xargo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment