commit f53fea6d5d5cc1f4235617f7db8c691ae3d6d390 parent 47a7cf82b1d27d833712750f7802de051947dceb Author: Georges Dupéron <georges.duperon@gmail.com> Date: Wed, 11 Jul 2018 15:04:47 +0200 Moved Makefile one level up (part 1: rename) Diffstat:
| M | .gitignore | | | 21 | +++++++++++++++++++-- |
| R | example-os/Makefile -> Makefile | | | 0 | |
| D | example-os/.gitignore | | | 19 | ------------------- |
3 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -1 +1,19 @@ -/deploy-screenshots/ -\ No newline at end of file +/os.bat +/os.ndisasm.disasm +/os.reasm.asm +/os.reasm +/os.reasm.disasm +/os.file +/os.fdisk +/os.arm.disasm +/os.zip +/os.zip.adjusted +/os.iso +/os.32k +/os.fat12 +/os.offsets +/os.hex_with_offsets +/iso_files/os.zip +/iso_files/boot/iso_boot.sys +/build/offsets/fat12_start.hex +/build/offsets/fat12_start.dec diff --git a/example-os/Makefile b/Makefile diff --git a/example-os/.gitignore b/example-os/.gitignore @@ -1,19 +0,0 @@ -/os.bat -/os.ndisasm.disasm -/os.reasm.asm -/os.reasm -/os.reasm.disasm -/os.file -/os.fdisk -/os.arm.disasm -/os.zip -/os.zip.adjusted -/os.iso -/os.32k -/os.fat12 -/os.offsets -/os.hex_with_offsets -/iso_files/os.zip -/iso_files/boot/iso_boot.sys -/build/offsets/fat12_start.hex -/build/offsets/fat12_start.dec