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

Merge branch 'master' into 'master'

Browse source 
Restore a command (deleted in my branch to fix MR conflict).

See merge request redox-os/redox!1303
This commit is contained in:
Jeremy Soller 2023-02-08 19:52:47 +00:00
parent 8760b5a47a 32d763e65d
commit f52ec7e30f
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -81,8 +81,7 @@ Sometimes things go wrong when compiling. Try the following before opening an is
1. Update **GNU Make**, **NASM** and **QEMU/VirtualBox**. 1. Update **GNU Make**, **NASM** and **QEMU/VirtualBox**.
1. Pull the upstream master branch (`git remote add upstream git@gitlab.redox-os.org:redox-os/redox.git; git pull upstream master`). 1. Pull the upstream master branch (`git remote add upstream git@gitlab.redox-os.org:redox-os/redox.git; git pull upstream master`).
1. Update submodules (`git submodule update --recursive --init`). 1. Update submodules (`git submodule update --recursive --init`).
1. Rebuild with `make rebuild`.
and then rebuild!
## <a name="contributing"> Contributing to Redox </a> ## <a name="contributing"> Contributing to Redox </a>