Merge branch 'kaleid' into master

This commit is contained in:
Adrien Bourmault 2019-02-15 16:08:36 +01:00 committed by GitHub
commit af7e5b54ae
1 changed files with 3 additions and 2 deletions

View File

@ -5,9 +5,10 @@
### Fully free operating system from scratch (WIP) ### Fully free operating system from scratch (WIP)
#### Loader Branch
Development focused on the kernel loader. #### Kaleid Branch
Development focused on the kernel itself, as it is still very basic.
For the project plan, see [OS/K Project](https://github.com/orgs/os-k-team/projects/1) For the project plan, see [OS/K Project](https://github.com/orgs/os-k-team/projects/1)