Merge branch 'master' of ssh://git.javalsai.tuxcord.net:1022/deadvey/crawos

2025-10-20 16:47:13 +01:00
parent 959c90a054 fbed363099
commit 44e4447d21
6 changed files with 5 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.swp
 disk-images/*
--- a/4
+++ b/4
@@ -29,3 +29,7 @@ $(BUILD_DIR)/boot.bin:
 kernel: $(BUILD_DIR)/kernel.bin
 $(BUILD_DIR)/kernel.bin:
 	$(ASM) $(SRC_DIR)/kernel/kernel.asm -f bin -o $ $(BUILD_DIR)/kernel.bin
 # Clean
 clean:
 	rm -f disk-images/*
--- a/disk_images/boot.bin
+++ b/disk_images/boot.bin
--- a/disk_images/crawos.img
+++ b/disk_images/crawos.img
--- a/disk_images/crawos.iso
+++ b/disk_images/crawos.iso
--- a/disk_images/kernel.bin
+++ b/disk_images/kernel.bin