Go to file
c0repwn3r 5ba67be4c0
resolve merge conflicts
2022-05-14 00:02:20 -04:00
.vscode Merge branch 'feature/rewrite' 2022-05-13 21:46:59 -04:00
bin resolve merge conflicts 2022-05-14 00:02:20 -04:00
include Merge branch 'feature/rewrite' 2022-05-13 21:46:59 -04:00
learning/old_src Merge branch 'feature/rewrite' 2022-05-13 21:46:59 -04:00
obj/kernel Merge branch 'feature/rewrite' 2022-05-13 21:46:59 -04:00
old Merge branch 'master' of https://git.coredoes.dev/c0repwn3r/shadeos 2022-05-13 23:59:11 -04:00
src resolve merge conflicts 2022-05-14 00:02:20 -04:00
.gitignore Merge branch 'feature/rewrite' 2022-05-13 21:46:59 -04:00
Makefile full GDT, 64bt rewrite finished 2022-05-13 23:53:59 -04:00