os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Adrien Bourmault 2019-03-29 14:23:36 +01:00
parent a6f615d792
commit c2509a4bb0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ProjectTree
View File

@ -124,11 +124,8 @@
│   │   │   ├── cpu.h │   │   │   ├── cpu.h
│   │   │   ├── heap.h │   │   │   ├── heap.h
│   │   │   ├── iomisc.h │   │   │   ├── iomisc.h
<<<<<<< Updated upstream
│   │   │   ├── mboot.h
=======
│   │   │   ├── log.h │   │   │   ├── log.h
>>>>>>> Stashed changes │   │   │   ├── mboot.h
│   │   │   ├── mm.h │   │   │   ├── mm.h
│   │   │   ├── panic.h │   │   │   ├── panic.h
│   │   │   ├── proc.h │   │   │   ├── proc.h
@ -168,12 +165,10 @@
├── grub.log ├── grub.log
├── kaleid32_disasm.asm ├── kaleid32_disasm.asm
├── kaleid64_disasm.asm ├── kaleid64_disasm.asm
├── loader_disasm32.asm
├── loader_disasm64.asm
├── Makefile ├── Makefile
├── memdump.bin ├── memdump.bin
├── ProjectTree ├── ProjectTree
├── qemu.log ├── qemu.log
└── Readme.md └── Readme.md
28 directories, 120 files 28 directories, 118 files