vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jeremy Soller 2018-04-02 20:23:09 -06:00
parent 5d462243b6 9d0ec3ea53
commit 05ac1e4d33
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -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> ### <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> ### <a name="discourse"> Discourse </a>

3
README.md
View file

@ -105,7 +105,7 @@ $ cd path/to/your/projects/folder/
# Run bootstrap setup # Run bootstrap setup
$ curl -sf https://raw.githubusercontent.com/redox-os/redox/master/bootstrap.sh -o bootstrap.sh && bash -e bootstrap.sh $ 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 $ cd redox
# Build Redox # Build Redox
@ -139,6 +139,7 @@ $ ./bootstrap.sh -d
# Install rustup.rs # Install rustup.rs
$ curl https://sh.rustup.rs -sSf | sh $ curl https://sh.rustup.rs -sSf | sh
$ source $HOME/.cargo/env
# Install the sysroot manager Xargo # Install the sysroot manager Xargo
$ cargo install xargo $ cargo install xargo